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

author Paul Mundt <[email protected]>

Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)

committer Paul Mundt <[email protected]>

Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
author Paul Mundt <[email protected]>
Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
committer Paul Mundt <[email protected]>
Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/dma/shdma.c
Simple merge
diff --cc drivers/i2c/busses/Kconfig
Simple merge
author	Paul Mundt <[email protected]>
	Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
committer	Paul Mundt <[email protected]>
	Thu, 20 May 2010 02:57:38 +0000 (11:57 +0900)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/shdma.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history