Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:56 +0000 (19:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:56 +0000 (19:08 +0100)
commit5a89770daad83df74d77a8d34a1ffaedae565ce9
tree0d8ef70293a6ef969ba8b7718e59608337643d40
parentc46c948260f41af18b277c1eb1895d788d3605dc
parentaf7c951d76708c61b862463d579d76be757130bf
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
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c