Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 31 May 2010 04:14:26 +0000 (13:14 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 31 May 2010 04:14:26 +0000 (13:14 +0900)
commitd5b732b17ca2fc74f370bdba5aae6c804fac8c35
tree4facc6d96116b032a3c1cb2ced9b2a3008e9216e
parenteb6e8605ee5f5b4e116451bf01b3f35eac446dde
parent67a3e12b05e055c0415c556a315a3d3eb637e29e
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
MAINTAINERS
drivers/dma/Kconfig
drivers/dma/shdma.c
drivers/serial/sh-sci.c
include/video/sh_mobile_lcdc.h