Merge branch 'v2.6.34-rc2' into drm-linus
authorDave Airlie <airlied@redhat.com>
Wed, 31 Mar 2010 04:55:14 +0000 (14:55 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 31 Mar 2010 04:55:14 +0000 (14:55 +1000)
commit3595be778d8cb887f0e0575ef0a0c1a094d120bb
tree15671ed8bd3597d2efe13aa57b755c66014acb57
parentc414a117c6094c3f86b533f97beaf45ef9075f03
parent220bf991b0366cc50a94feede3d7341fa5710ee4
Merge branch 'v2.6.34-rc2' into drm-linus
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/radeon/radeon_combios.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/ttm/ttm_memory.c