Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Mon, 31 May 2010 04:14:26 +0000 (13:14 +0900)]
1  2 
MAINTAINERS
drivers/dma/Kconfig
drivers/dma/shdma.c
drivers/serial/sh-sci.c
include/video/sh_mobile_lcdc.h

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