diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 21:08:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-19 21:08:11 +0200 |
commit | 19853301ef3289bda2d5264c1093e74efddaeab9 (patch) | |
tree | 494e340a7d7302b3331cebe51a6c4415889bff16 /arch/um | |
parent | Merge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | nouveau: Set special lane map for the right chipset (diff) | |
download | linux-19853301ef3289bda2d5264c1093e74efddaeab9.tar.xz linux-19853301ef3289bda2d5264c1093e74efddaeab9.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"It's like a grab bag of one liners:
- core: fix page flip error path, reorder object teardown.
- usb: fix the drm_usb module license.
- i915: VT switch on SNB with non-native modes fix, and a regression
fix from 3.3.
- radeon: missing unreserve on SI, AGP/VRAM setup fix (fixes radeon on
IA64, but its a generic bug), an rn50 regression from 3.3, turn off
MSIs on rv515 (it loses rearms every so often)."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
nouveau: Set special lane map for the right chipset
drm/radeon: fix load detect on rn50 with hardcoded EDIDs.
drm: Releasing FBs before releasing GEM objects during drm_release
drm/nouveau/pm: don't read/write beyond end of stack buffer
drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h
radeon: fix r600/agp when vram is after AGP (v3)
drm: fix page_flip error handling
drm/radeon/kms: fix the regression of DVI connector check
drm/usb: fix module license on drm/usb layer.
drm/i915: Do not set "Enable Panel Fitter" on SNB pageflips
drm/i915: Hold mode_config lock whilst changing mode for lastclose()
drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2
drm/radeon: disable MSI on RV515
drm/i915: don't clobber the special upscaling lvds timings
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions