From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Dec 2011 14:43:53 +0000 (+0000)
Subject: Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
X-Git-Tag: v3.3-rc1~121^2~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbe6f625f69e48c4001051dc1431afc704acfaa;p=pandora-kernel.git

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
---

1fbe6f625f69e48c4001051dc1431afc704acfaa
Reading git-diff-tree failed