]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 20 Feb 2013 21:13:17 +0000 (07:13 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 20 Feb 2013 21:13:56 +0000 (07:13 +1000)
commite9195d33dbbb2d6b1abeff8d5f636a6375795dd0
tree5d24895f6a9bdb7c8438f405867fc1b61b549fd5
parent0acab0c15c94d7e471b5973f056179ba6a736752
parent0fbc908e241407d1742e75e853aa68ddafb77805
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
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nv50_display.c