Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and ...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
commitddf90a2ff2c4a9da99acc898a4afeab3e4251fcd
tree97eb0b6e2d4fad9d5a3e58a4762997c6170ae05d
parentdfb85185bda373a70409c70c2632b02fb0f8f449
parent5693188a6e888603afa9564974145e5e6e2c623c
parent56cb248428ead13a6b423ed3f3cf9e4aa01244b1
parentd098bc7d58ebda22a6554b6c9df1056802d9900f
parent34fd421349ffc6a4280b71276bf7c6d48f92156f
parent90cf2418f5c45192bac1ac57af62f61dbac92886
parentd12379acaf55a395083ca81d753b1af75507556c
Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus
arch/arm/Kconfig
arch/arm/include/asm/thread_info.h
arch/arm/kernel/smp.c
drivers/mmc/host/mmci.c