Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and ...

author Russell King <[email protected]>

Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)

committer Russell King <[email protected]>

Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
author Russell King <[email protected]>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
committer Russell King <[email protected]>
Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/include/asm/thread_info.h
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc drivers/mmc/host/mmci.c
Simple merge
author	Russell King <[email protected]>
	Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
committer	Russell King <[email protected]>
	Mon, 21 May 2012 14:15:10 +0000 (15:15 +0100)
		1	2	3	4	5	6	7
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
arch/arm/include/asm/thread_info.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/mmc/host/mmci.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history