Merge branch 'pxa-devel' into pxa

author Russell King <[email protected]>

Sat, 12 Jul 2008 20:43:51 +0000 (21:43 +0100)

committer Russell King <[email protected]>

Sat, 12 Jul 2008 20:43:51 +0000 (21:43 +0100)
author Russell King <[email protected]>
Sat, 12 Jul 2008 20:43:51 +0000 (21:43 +0100)
committer Russell King <[email protected]>
Sat, 12 Jul 2008 20:43:51 +0000 (21:43 +0100)
diff --cc arch/arm/mach-pxa/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/clock.h
Simple merge
diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge
diff --cc arch/arm/mach-pxa/ssp.c
Simple merge
diff --cc include/asm-arm/arch-pxa/irqs.h
Simple merge
author	Russell King <[email protected]>
	Sat, 12 Jul 2008 20:43:51 +0000 (21:43 +0100)
committer	Russell King <[email protected]>
	Sat, 12 Jul 2008 20:43:51 +0000 (21:43 +0100)
		1	2
arch/arm/mach-pxa/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/clock.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/mainstone.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/ssp.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-arm/arch-pxa/irqs.h	patch \|	diff1 \|	diff2 \|	blob \| history