diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 10:12:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 10:12:21 -0700 |
commit | e1a7eb08ee097e97e928062a242b0de5b2599a11 (patch) | |
tree | 2e94ca0bd2ac5a53a4a7234b2f1b5f98f669cca8 /include/drm | |
parent | 464662b91614188b4af9df51baaa0d6b3d89a15f (diff) | |
parent | 62fb376e214d3c1bfdf6fbb77dac162f6da04d7e (diff) |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Mainly nouveau fixes, one for a regressions in -rc1, fixes for booting
on a ppc G5, and a Kconfig fix. Two radeon fixes, one oops, one s/r
fix. One udl mmap fix. And one core drm fix to stop bad fbdev apps
overwriting bits of ram."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm: Validate requested virtual size against allocated fb size
drm/radeon: Don't dereference possibly-NULL pointer.
mm, drm/udl: fixup vma flags on mmap
drm/radeon/kms: fix fans after resume
nouveau/bios: Fix tracking of BIOS image data
nouveau: Fix crash when pci_ram_rom() returns a size of 0
drm/nouveau: select POWER_SUPPLY
drm/nouveau: inform userspace of relaxed kernel subchannel requirements
Revert "drm/nouveau: inform userspace of new kernel subchannel requirements"
drm/nouveau: oops, create m2mf for nvd9 too
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions