Merge branch 'pxa-tosa' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:01 +0000 (21:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:01 +0000 (21:43 +0100)
commit7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b
tree110d24e6394dbd98cb33d80a5587cd18c8315e0b
parenta9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3
parent938870491f0cad030b358af47e28d124b72702d1
Merge branch 'pxa-tosa' into pxa

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
MAINTAINERS
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/mfd/Kconfig
include/asm-arm/arch-pxa/hardware.h
include/asm-arm/arch-pxa/system.h