Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

author Russell King <rmk+kernel@arm.linux.org.uk>

Mon, 14 Mar 2011 22:26:30 +0000 (22:26 +0000)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Mon, 14 Mar 2011 22:26:30 +0000 (22:26 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Mar 2011 22:26:30 +0000 (22:26 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 14 Mar 2011 22:26:30 +0000 (22:26 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-davinci/devices-da8xx.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 14 Mar 2011 22:26:30 +0000 (22:26 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 14 Mar 2011 22:26:30 +0000 (22:26 +0000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/devices-da8xx.c	patch \|	diff1 \|	diff2 \|	blob \| history