git.stricted.de - GitHub/moto-9609/android_kernel_motorola

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

restore debugfs vbios, fix multiple actions with supervisor intrs

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: restore debugfs/vbios.rom support
  drm/nv50-/kms: remove UPDATE methods after each encoder disconnect
  drm/nvd0/disp: handle multiple actions from one set of supervisor intrs
  drm/nv50/disp: handle multiple actions from one set of supervisor intrs

author	Dave Airlie <airlied@redhat.com>
	Wed, 20 Feb 2013 21:13:17 +0000 (07:13 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Wed, 20 Feb 2013 21:13:56 +0000 (07:13 +1000)
commit	e9f211ad7d65b264998928cea822c11c88e5586b
tree	5d24895f6a9bdb7c8438f405867fc1b61b549fd5	tree \| snapshot (tar.gz zip)
parent	2e82b5dd47d826baf0f6e34334fe6b899aa6ad1e	commit \| diff
parent	33b903e82873ba9233bd89c44d016b87347ed158	commit \| diff

drivers/gpu/drm/nouveau/nouveau_drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history