Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Mon, 31 Mar 2014 09:43:50 +0000 (10:43 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 31 Mar 2014 09:43:50 +0000 (10:43 +0100)
commitdc767302872a55c9849aade1719134a2ba7528b0
treeb55bfce70e8a825e9a041b3a96fdf6485589bed1
parent696e897344f58397b3d463fbb9f9a2f317d720c0
parent483a53b310dfefdd8c010ba0cc5b2addfaef123f
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
arch/arm/include/asm/hardware/coresight.h
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/include/asm/hardware/coresight.h
arch/arm64/mm/proc.S