diff options
| author | Dave Airlie | 2013-02-21 07:13:17 +1000 |
|---|---|---|
| committer | Dave Airlie | 2013-02-21 07:13:56 +1000 |
| commit | e9f211ad7d65b264998928cea822c11c88e5586b (patch) | |
| tree | 5d24895f6a9bdb7c8438f405867fc1b61b549fd5 /COPYING | |
| parent | 2e82b5dd47d826baf0f6e34334fe6b899aa6ad1e (diff) | |
| parent | 33b903e82873ba9233bd89c44d016b87347ed158 (diff) | |
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 'COPYING')
0 files changed, 0 insertions, 0 deletions