Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
authorMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:00:53 +0000 (11:00 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:00:53 +0000 (11:00 +0000)
commit3cc3cdd80b944ed697c7aaeef25b7a170177d7f1
treef2df35ca55bc2d50876fe586b4eec8c68c158da7
parent1168f85d54c9cfcc0b93412c363e4d21bf36de47
parent54d6df91aea686c8c46095256d8c27d3db26c4e8
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

Conflicts:
arch/arm64/Makefile
arch/arm64/Makefile
drivers/cpufreq/cpufreq_interactive.c
kernel/power/process.c
net/ipv4/ping.c