Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)

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

Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/magician.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 6 Apr 2009 08:57:38 +0000 (09:57 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/magician.c	patch \|	diff1 \|	diff2 \|	blob \| history