Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
commit1f782fee18b39b9ad438ebbd82c2915a16c879ee
treef292930065e6c860714c134790ab8882680ac739
parent8eda2f21ed9c936a54fd7bc16cbfa5ee656635c2
parentf4b87dee923342505e1ddba8d34ce9de33e75050
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
MAINTAINERS
drivers/dma/Kconfig
drivers/dma/shdma.c
drivers/video/Kconfig