diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-01-08 17:57:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-01-08 17:57:45 +1000 |
| commit | ceb3b0212dfc843a6abe8a6f3b4e28c1f2059e64 (patch) | |
| tree | f6cbcb55ada87029a5cea155f73ebfb2df5056fa /arch/cris/arch-v32/kernel | |
| parent | a3f28efa5733f78e467c3ab26b9db0aabadb73ed (diff) | |
| parent | bbc6319676944aa43527656b996766b85558e7e0 (diff) | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/nouveau/linux-2.6 into drm-fixes
misc fixes for nouveau, one more msi rearm, regression fix for old bioses
crash and leak fixes.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/nouveau/linux-2.6:
drm/nouveau/nouveau: fix memory leak in nouveau_crtc_page_flip()
drm/nouveau/bios: fix offset calculation for BMPv1 bioses
drm/nouveau: return offset of allocated notifier
drm/nouveau/bios: make jump conditional
drm/nvce/mc: fix msi rearm on GF114
drm/nvc0/gr: fix mthd data submission
drm/nouveau: populate master subdev pointer only when fully constructed
Diffstat (limited to 'arch/cris/arch-v32/kernel')
0 files changed, 0 insertions, 0 deletions