]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
1  2 
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

Simple merge
Simple merge
Simple merge