Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
authorKevin Hilman <khilman@linaro.org>
Mon, 11 May 2015 23:36:30 +0000 (16:36 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 11 May 2015 23:36:30 +0000 (16:36 -0700)
commit96ba231c1546b7c5d20e90437f45bd9089316b86
tree3b2143fc6dd5fd182ae430ac4610d8f6789c7ebc
parent14cdcbf57afac55489130a55ea0e8a59481531d8
parent05f74e8baccb60882ace4d0165887368e8143f3f
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

 Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/kernel/Makefile