tree 5d24895f6a9bdb7c8438f405867fc1b61b549fd5
parent 2e82b5dd47d826baf0f6e34334fe6b899aa6ad1e
parent 33b903e82873ba9233bd89c44d016b87347ed158
author Dave Airlie <airlied@redhat.com> 1361394797 +1000
committer Dave Airlie <airlied@redhat.com> 1361394836 +1000

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