Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

author Paul Mundt <lethal@linux-sh.org>

Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)

committer Paul Mundt <lethal@linux-sh.org>

Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
author Paul Mundt <lethal@linux-sh.org>
Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/dma/Kconfig
Simple merge
diff --cc drivers/dma/shdma.c
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Sun, 23 May 2010 23:52:55 +0000 (08:52 +0900)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/shdma.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history