From: Linus Torvalds Date: Sat, 2 Jul 2011 16:08:56 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Tag: v3.0-rc6~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e139047e2eecd0ccf8bc2f1564e82747cb6e56c;p=pandora-kernel.git 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 --- 6e139047e2eecd0ccf8bc2f1564e82747cb6e56c Reading git-diff-tree failed