tree 826b741201a2e09a627ed350c6ff36935f5cff79
parent 0cecdd818cd79d092e36e70dfe3a71f2878d6b96
parent 384703b8e6cd4c8ef08512e596024e028c91c339
author Dave Airlie <airlied@redhat.com> 1324392233 +0000
committer Dave Airlie <airlied@redhat.com> 1324392233 +0000

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