Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 17:05:10 +0000 (18:05 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 17:05:10 +0000 (18:05 +0100)
commit4b60e5f90dec4ae251386f20464336369e962e9c
tree13ca50e109a23bcc5e1622ca658000cb85668d1e
parente8765afe54b72b85ffe2b60683710ff450a92912
parent667f390bee987d45351402e42008c52cdfb77d76
parenta35d4e58737116fd4126c240a1faeb735839435e
parent4d5336d50a7b4992c90729c27dae027a3426c48c
parent041f10d46f97c87f8ae1cdb4117682214732cc45
parentbe20902ba67de70b38c995903321f4152dee57b7
Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-realview/core.c
arch/arm/mach-versatile/core.c
arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mm/init.c
drivers/mtd/maps/Makefile