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)
commitbce5669be3a8946952258a064ef26defeb887138
tree117386b9909882c000f822011c5ea6fdcbab3273
parent95959e6a06720834fc80a210e37898341c63cb91
parent566b60c04ab230b8cc3845f964306f99504b18df
Merge branch 'devel-stable' into for-next
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c