Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 18:08:10 +0000 (18:08 +0000)
commit31edf274f9aff1ccd39934a0b2fce38f4405c656
treefdc7bc445307ccb9648ca1a71375947c8ed59722
parent3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
parented60453fa8f8fc3d034dfdf10371a99cc6905626
parentac61d143ffe2a6db4d4bcf47c21a5159d6a1b644
parent28257f7fdee0facc3b7f934e82c2485f27120d41
parentb23065313297e750edd57ab6edfd36224826724e
parent50005a8deb38e5e6456ebd94e57adb321d4589de
parentcf562b4a550b3cd9d602a05bc27aaaaa376947b4
parent3d09fbcd26851ffb2c40cec411b8e56db02520d1
parent8a9618f5dfca35edb0d7ab6374ff586e2e9e989b
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel
arch/arm/Kconfig
arch/arm/mach-realview/core.c
arch/arm/mach-vexpress/ct-ca9x4.c
drivers/pcmcia/sa1100_generic.c
drivers/pcmcia/soc_common.c
scripts/recordmcount.h