Merge branch 'v2.6.34-rc2' into drm-linus

diff --cc drivers/gpu/drm/nouveau/nouveau_bios.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_combios.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_memory.c
Simple merge