Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 12 May 2014 17:21:22 +0000 (18:21 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 12 May 2014 17:21:22 +0000 (18:21 +0100)
commitd1e204cb01af58a80ee4b77eb957a69833fb502c
tree85b8f936a561101cd5408037dc44c4dbb78036ac
parentcd4c4a096c14dece853de1e1bdc6b5d1fa1928e8
parent3abb7f235bacff959dc5a12c4ef77a4f358d2dc5
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into linux-linaro-lsk

Conflicts:
arch/arm64/mm/dma-mapping.c
arch/arm64/mm/init.c
arch/arm64/Kconfig