diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-07 12:34:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-07 12:34:03 +0800 |
| commit | 24284529d5e0b544b87f340850bf51690d50f573 (patch) | |
| tree | bb3d8078cae8dd89430457f262dd4a1414ae722d /include/linux/pageblock-flags.h | |
| parent | ffded77eacc0ffbf14f48e190ac45417102e1eea (diff) | |
| parent | b36eba9b4dd4344ed51b8f644049aeac606ccff2 (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18
Conflicts:
add cpufeature.o in arch/arm64/kernel/Makefile
Diffstat (limited to 'include/linux/pageblock-flags.h')
0 files changed, 0 insertions, 0 deletions