diff options
author | Mark Brown <broonie@linaro.org> | 2014-07-25 12:50:12 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-25 12:50:12 +0100 |
commit | 108212d3384e981273049b8d007edcf612f1eda4 (patch) | |
tree | 1aa647e1cca149e493d13a55d68ca18b11b7e8dc /arch/arm/mm/Makefile | |
parent | c69294e957dd173809ec7815231e6aff6d5c2d83 (diff) | |
parent | 6dca4f12e885d399d7a6fb9ab396981153886f9e (diff) |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
arch/arm64/mm/tlb.S
Diffstat (limited to 'arch/arm/mm/Makefile')
0 files changed, 0 insertions, 0 deletions