drivers/gpu/drm/nouveau/nouveau_bo.c · b2e0d195d29326fce6aef8f2f789028bf21d743f · Ermine / R128

13 years ago

Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next · 1fbe6f62

Dave Airlie authored 13 years ago

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

1fbe6f62

History

Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

Dave Airlie authored 13 years ago

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