]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Apr 2011 00:56:07 +0000 (17:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Apr 2011 00:56:07 +0000 (17:56 -0700)
commitb2a8b4b81966094703088a7bc76a313af841924d
tree944235c53261c1897f0b7507bed438c18187714c
parentbdfd6b7d761c7bb8bc93055dac5040ece7d58e10
parent5df23979bc628934febe02e80f9644ec67603ee8
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: fix "persistant" typo
  drm/radeon/kms: add some new ontario pci ids
  drm/radeon/kms: pageflipping cleanup for avivo+
  drm/radeon/kms: Add support for tv-out dongle on G5 9600
  drm: export drm_find_cea_extension to drivers
  drm/radeon/kms: add some sanity checks to obj info record parsingi (v2)
  drm/i915: Reset GMBUS controller after NAK
  drm/i915: Busy-spin wait_for condition in atomic contexts
  drm/i915/lvds: Always return connected in the absence of better information