Merge branch 'u300' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:44 +0000 (11:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:44 +0000 (11:01 +0100)
commitb7c11ec9f1c9f4272f032215ddb0b65d64b22ecc
treec65b81ef9ae5076d2137034accfa2610f45a13de
parent06099961002a813324d057a91695af7c72939da6
parent7666c17e2b0986a079da46122d8658544416c2cf
Merge branch 'u300' into devel

Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
arch/arm/mm/mmu.c