Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Apr 2014 23:33:49 +0000 (00:33 +0100)
1  2 
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c

Simple merge
Simple merge