diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-16 17:47:31 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-16 17:47:31 +0200 |
commit | 7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239 (patch) | |
tree | d65f02ae98b229604e04df9984632272686cef9a /drivers/mtd | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
parent | drm: Take lock around probes for drm_fb_helper_hotplug_event (diff) | |
download | linux-7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239.tar.xz linux-7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239.zip |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Take lock around probes for drm_fb_helper_hotplug_event
drm/i915: Revert i915.semaphore=1 default from 47ae63e0
vga_switcheroo: don't toggle-switch devices
drm/radeon/kms: add some evergreen/ni safe regs
drm/radeon/kms: fix extended lvds info parsing
drm/radeon/kms: fix tiling reg on fusion
Diffstat (limited to 'drivers/mtd')
0 files changed, 0 insertions, 0 deletions