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)
commit108212d3384e981273049b8d007edcf612f1eda4
tree1aa647e1cca149e493d13a55d68ca18b11b7e8dc
parentc69294e957dd173809ec7815231e6aff6d5c2d83
parent6dca4f12e885d399d7a6fb9ab396981153886f9e
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/mm/tlb.S
arch/arm64/include/asm/pgtable.h