Merge branch 'devel-stable' into for-next

author Russell King <[email protected]>

Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)

committer Russell King <[email protected]>

Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
author Russell King <[email protected]>
Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
committer Russell King <[email protected]>
Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
author	Russell King <[email protected]>
	Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
committer	Russell King <[email protected]>
	Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	patch \|	diff1 \|	diff2 \|	blob \| history