projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c69294e 6dca4f1)
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Fri, 25 Jul 2014 11:50:12 +0000 (12:50 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Jul 2014 11:50:12 +0000 (12:50 +0100)
Conflicts:
arch/arm64/mm/tlb.S

1  2 
arch/arm64/include/asm/pgtable.h patch | diff1 | diff2 | blob | history

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