nt ea4039a34c4c206d015d34a49d0b00868e37db1d
parent 6991b8f2a3193397461104a27be417addb8d032b
author Linus Torvalds <torvalds@linux-foundation.org> 1321404212 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321404212 -0200

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
´+ÞÚŸ