Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Sun, 18 May 2014 14:03:39 +0000 (15:03 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 18 May 2014 14:03:39 +0000 (15:03 +0100)
commit1e835a464b6127329704a237cf8da142e4f6d1e8
treefa3e2848a28de0954d1196e9dc09db3f81f960df
parenta5d53ad243dc3178fa9001d8ab1f19c63f8debd5
parent75448bec59b915885b3e84bca0d38acf34b5db61
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm64/Kconfig
arch/arm64/kernel/process.c