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

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

Mon, 21 Sep 2009 15:02:24 +0000 (16:02 +0100)

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

Mon, 21 Sep 2009 15:02:30 +0000 (16:02 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:02:24 +0000 (16:02 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:02:30 +0000 (16:02 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/include/asm/cputype.h
Simple merge
diff --cc drivers/net/irda/pxaficp_ir.c
Simple merge
diff --cc sound/arm/pxa2xx-ac97.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 21 Sep 2009 15:02:24 +0000 (16:02 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 21 Sep 2009 15:02:30 +0000 (16:02 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/cputype.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/pxaficp_ir.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/arm/pxa2xx-ac97.c	patch \|	diff1 \|	diff2 \|	blob \| history