Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)]
1  2 
MAINTAINERS
drivers/dma/Kconfig
drivers/dma/shdma.c
drivers/video/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge