tree 0d8ef70293a6ef969ba8b7718e59608337643d40
parent c46c948260f41af18b277c1eb1895d788d3605dc
parent af7c951d76708c61b862463d579d76be757130bf
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1223402936 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1223402936 +0100

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c