| commit | 6e139047e2eecd0ccf8bc2f1564e82747cb6e56c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 2 Jul 2011 16:08:56 +0000 (2 09:08 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 2 Jul 2011 16:08:56 +0000 (2 09:08 -0700) | ||
| tree | 7a6da9101cb04b918a3c76bfe21abbd2bdeb4d99 | treesnapshot (tar.gz zip) |
| parent | c66a86d0cdce3bad2da794f114cc37377d242c3d | commitdiff |
| parent | 6002525170df5f72c92ab946b6ebf1656aaec74d | 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:
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
* '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