diff options
author | Dave Airlie <airlied@redhat.com> | 2013-02-20 22:13:17 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-02-20 22:13:56 +0100 |
commit | e9f211ad7d65b264998928cea822c11c88e5586b (patch) | |
tree | 5d24895f6a9bdb7c8438f405867fc1b61b549fd5 /drivers/isdn/divert | |
parent | gpu: remove gma500 stub driver (diff) | |
parent | drm/nouveau: restore debugfs/vbios.rom support (diff) | |
download | linux-e9f211ad7d65b264998928cea822c11c88e5586b.tar.xz linux-e9f211ad7d65b264998928cea822c11c88e5586b.zip |
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
Diffstat (limited to 'drivers/isdn/divert')
0 files changed, 0 insertions, 0 deletions