projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd4c4a0 3abb7f2)
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)
Conflicts:
arch/arm64/mm/dma-mapping.c
arch/arm64/mm/init.c

1  2 
arch/arm64/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.