commit | 96ba231c1546b7c5d20e90437f45bd9089316b86 | [log] [tgz] |
---|---|---|
author | Kevin Hilman <khilman@linaro.org> | Mon May 11 16:36:30 2015 -0700 |
committer | Kevin Hilman <khilman@linaro.org> | Mon May 11 16:36:30 2015 -0700 |
tree | 3b2143fc6dd5fd182ae430ac4610d8f6789c7ebc | |
parent | 14cdcbf57afac55489130a55ea0e8a59481531d8 [diff] | |
parent | 05f74e8baccb60882ace4d0165887368e8143f3f [diff] |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android Conflicts: arch/arm64/kernel/Makefile