Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jun 2014 11:36:22 +0000 (12:36 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jun 2014 11:36:22 +0000 (12:36 +0100)
commitbd63ce27d9d62bc40a962b991cbbbe4f0dc913d2
treebd998b187b7ea4e9f28c0c61912b701bc6ff6420
parent1fb333489fb917c704ad43e51b45c12f52215a9c
parent6b74f61a471ad0f3a5e919e314d4f60cd3966f5e
Merge branch 'devel-stable' into for-next
arch/arm/mm/dma-mapping.c