]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5cd76855f3c719b52712eed173e1850e4f028560
tree13ca50e109a23bcc5e1622ca658000cb85668d1e
parentc31b04bb34fd45ff979754b3b3675e255c1f4885
parentfed1de6716a0d3040d6c7d11142648de70f78c49
parente1b8fd6a8f26fe9e447d10932ff6bfbbf761d898
parentaeb2b4be97f5a75f73c858439f18d6b413e1f82d
parent9a3f305a69d26b01962b389d232765b158774043
parentb31ab4f0328da882da18551ab27fc3e0d0f667d3
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