OSDN Git Service

Merge from 2.6 kernel (Linus Torvalds)
authorMichel Daenzer <michel@daenzer.net>
Fri, 15 Aug 2003 10:31:54 +0000 (10:31 +0000)
committerMichel Daenzer <michel@daenzer.net>
Fri, 15 Aug 2003 10:31:54 +0000 (10:31 +0000)
commit9d7b01ebbe71ff6ca3ea421d5bff64f403b592ba
tree8f5d66868305facceb7d0ecdde93c5569c8b5a53
parenta073ff7dc73dc98e81e2ae26e8c500ea7141084b
Merge from 2.6 kernel (Linus Torvalds)
linux-core/Kconfig
linux-core/drm_agpsupport.c
linux-core/drm_dma.c
linux-core/drm_drv.c
linux-core/drm_vm.c
linux/Kconfig
linux/drm_agpsupport.h
linux/drm_dma.h
linux/drm_drv.h
linux/drm_vm.h