From: Dave Airlie Date: Thu, 8 Oct 2009 04:03:05 +0000 (+1000) Subject: Merge branch 'drm-next' of ../drm-next into drm-linus X-Git-Tag: v2.6.32-rc4~32^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1176d6f03e1085797ce83648a2c76ae15a2b515;p=pandora-kernel.git Merge branch 'drm-next' of ../drm-next into drm-linus conflict in radeon since new init path merged with vga arb code. Conflicts: drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/radeon_device.c --- c1176d6f03e1085797ce83648a2c76ae15a2b515 Reading git-diff-tree failed