diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-31 13:33:20 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-31 13:33:20 +0800 |
| commit | 293c379504006b5ea8b4e7109ba4ebc3211f9b91 (patch) | |
| tree | 1964134ada97a7329bcc822217ca93e3e47b9500 /arch/um/Makefile | |
| parent | 13b48cd3ac945d4e4075bec53f107a315fe771ae (diff) | |
| parent | f0d0a93b0e81278e86c7d81c25a54ac4f4b739d2 (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
keep lsk used current_stack_pointer and arch_within_stack_frames
in arch/x86/include/asm/thread_info.h
Diffstat (limited to 'arch/um/Makefile')
0 files changed, 0 insertions, 0 deletions