Merge branches 'clks' and 'pnx' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:10:38 +0000 (22:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:10:38 +0000 (22:10 +0000)
commit9f33be2c3a80bdc2cc08342dd77fac87652e0548
tree7ad6e825427a15c5ec0fc15540abc0429d7f4bce
parent2741ecb4ce5c2d430b5c44b0a169038338c21df5
parenteed18b5fa4d297c681b00144e8c6942dd35d39a7
Merge branches 'clks' and 'pnx' into devel
arch/arm/Kconfig
arch/arm/include/asm/cacheflush.h
arch/arm/mach-ep93xx/clock.c
arch/arm/mach-u300/clock.c
arch/arm/mach-w90x900/cpu.c
arch/arm/mm/mmu.c