Merge branches 'fixes', 'pgt-next' and 'versatile' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 20 Mar 2011 09:32:12 +0000 (09:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 20 Mar 2011 09:32:12 +0000 (09:32 +0000)
commit196f020fbbb83d246960548e73a40fd08f3e7866
treeaed9fa4c32938a4502eb8971dce18f74f0059162
parent6d7ed21d17e640b120b902a314143e5ef4917a70
parent7d85d61f6ad6e2d6a14b5c20369bc9569f634855
parent516295e5ab4bf986865cfff856d484ec678e3b0b
parent3de4ade3d696db31d1543dce585ba6296f876612
Merge branches 'fixes', 'pgt-next' and 'versatile' into devel
17 files changed:
arch/arm/Kconfig
arch/arm/include/asm/outercache.h
arch/arm/include/asm/setup.h
arch/arm/kernel/setup.c
arch/arm/kernel/traps.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-realview/realview_pbx.c
arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/init.c
arch/arm/mm/mmu.c
arch/arm/mm/pgd.c
drivers/video/amba-clcd.c