Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into lsk-v3.10-arm64-misc
authorMark Brown <broonie@linaro.org>
Sat, 24 May 2014 13:04:44 +0000 (14:04 +0100)
committerMark Brown <broonie@linaro.org>
Sat, 24 May 2014 13:04:44 +0000 (14:04 +0100)
commitea3518bfc02dff43d671a4f9e2799882689a0db4
tree26bd6d5d6a0814fac6c146c473bf3108a53caa80
parent2036aef6cd62206f0092b4b8af8206201fc08c10
parent6d08693da9e9512a6739c4a873c9f42d0c8d0f26
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-dma' into lsk-v3.10-arm64-misc

Conflicts:
arch/arm64/Kconfig
arch/arm64/mm/dma-mapping.c
mm/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/cacheflush.h
arch/arm64/kernel/setup.c
arch/arm64/mm/cache.S
arch/arm64/mm/init.c
mm/Kconfig