Merge branches 'fixes', 'misc' and 'mmci' into for-next

author Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 15 May 2013 18:41:05 +0000 (19:41 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 15 May 2013 18:41:05 +0000 (19:41 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 May 2013 18:41:05 +0000 (19:41 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 May 2013 18:41:05 +0000 (19:41 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/mmc/host/mmci.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 15 May 2013 18:41:05 +0000 (19:41 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 15 May 2013 18:41:05 +0000 (19:41 +0100)
		1	2	3
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/mmc/host/mmci.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history