Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Nov 2011 00:43:32 +0000 (22:43 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Nov 2011 00:43:32 +0000 (22:43 -0200)
commitb1914cb2f35c3995b778e55fdb1d569b9c6a92af
tree10468978322ce514b14ec20e4847878c616c5180
parentea4039a34c4c206d015d34a49d0b00868e37db1d
parent6991b8f2a3193397461104a27be417addb8d032b
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: fix segfault in pm rework
  drm/radeon/kms: fix up gpio i2c mask bits for r4xx
  drm/radeon: add some missing FireMV pci ids
  vgaarb: a NULL bridge is acceptable for root devices.
  drm: Remove utterly bogus preempt_disable() sections