diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-18 20:50:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-18 20:50:26 +0000 |
| commit | 22ad963d66fa029662b459d2066017f9c4a99ee9 (patch) | |
| tree | 34644c130d9ce3890ebe52031bf979ff3a0ebdec /kernel/Makefile | |
| parent | 69487098cc37d897c210f18d4b5b3dfb5d8d7ff4 (diff) | |
| parent | 2eb736d6b425cb932b038fd555243b9b0e59c036 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
arch/arm64/include/asm/processor.h
Diffstat (limited to 'kernel/Makefile')
0 files changed, 0 insertions, 0 deletions