From: Dave Airlie Date: Tue, 8 Sep 2009 04:49:32 +0000 (+1000) Subject: Merge remote branch 'origin/master' of ../linux-2.6 into drm-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge remote branch 'origin/master' of ../linux-2.6 into drm-next This was a non-trivial merge with some patches sent to Linus in drm-fixes. Conflicts: drivers/gpu/drm/radeon/r300.c drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/rs600.c drivers/gpu/drm/radeon/rs690.c drivers/gpu/drm/radeon/rv515.c --- cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d