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

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

Sun, 13 Dec 2009 16:35:09 +0000 (16:35 +0000)

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

Sun, 13 Dec 2009 16:35:09 +0000 (16:35 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 Dec 2009 16:35:09 +0000 (16:35 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 Dec 2009 16:35:09 +0000 (16:35 +0000)
diff --cc arch/arm/Kconfig.debug
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 13 Dec 2009 16:35:09 +0000 (16:35 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 13 Dec 2009 16:35:09 +0000 (16:35 +0000)
		1	2
arch/arm/Kconfig.debug	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history