| commit | 7c21738efd0b5e8c2a9ac2440e7ffbf432d6f239 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 16 May 2011 15:47:31 +0000 (16 08:47 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 16 May 2011 15:47:31 +0000 (16 08:47 -0700) | ||
| tree | d65f02ae98b229604e04df9984632272686cef9a | treesnapshot (tar.gz zip) |
| parent | eed631e0d741d1a1067cfc6d709fdf2363126f9c | commitdiff |
| parent | 752d2635ebb12b6122ba05775f7d1ccfef14b275 | commitdiff |
Merge branch 'drm-fixes' of git://git./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
* '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