Dave Airlie 1fbe6f625f Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c
2011-12-20 14:43:53 +00:00
..
2011-11-02 12:53:43 +01:00
2011-12-13 16:13:15 -08:00
2011-11-18 15:00:48 -08:00
2011-11-26 17:37:38 -08:00