]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jul 2011 16:08:56 +0000 (09:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jul 2011 16:08:56 +0000 (09:08 -0700)
commit738b73c33c5416ff65d9b95440b7aba00723a1b8
tree7a6da9101cb04b918a3c76bfe21abbd2bdeb4d99
parentccdc2ff8736dbfcb4cf080b2513824c59a74b007
parent207cfe26a3d127405b71e64046e327ee47bab1f4
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:
  Revert "drm/nvc0: recognise 0xdX chipsets as NV_C0"
  drm/radeon/kms: fix typo in cayman reg offset
  drm/radeon/kms: use correct reg on fusion when reading back mem config