diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-15 10:06:27 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-15 10:34:39 (GMT) |
| commit | 841d681618d81ee303ef0603eb6940b02f0981f2 (patch) | |
| tree | 1904d583b6a58e576d18df1a9e412c333b309f10 /arch/mn10300 | |
| parent | 4612ed6853c073deb31340a88a44115ae351d8b6 (diff) | |
| parent | 05afd4c0af6a43f6bda7caaacb01bc0116d50d3b (diff) | |
| download | linux-841d681618d81ee303ef0603eb6940b02f0981f2.tar.xz | |
Merge remote-tracking branch 'lts/linux-4.9.y' into linux-linaro-lsk-v4.9
Conflicts:
arch/arm64/kernel/entry.S
compatiable with PAN in arch/arm64/kernel/traps.c
Diffstat (limited to 'arch/mn10300')
0 files changed, 0 insertions, 0 deletions