Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Sat, 10 Jan 2015 11:54:47 +0000 (11:54 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 10 Jan 2015 11:54:47 +0000 (11:54 +0000)
commita2ac82c9d0b5898426a9379d8c3855b03614dbf6
tree23750cba64f601506d65203503e49528dc365834
parentbccb225417c38461916eced0d24cfdfcdfb03f86
parent2156eda2aafa0b0f660656246a11d7c2a9947ff9
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c
arch/arm/Kconfig.debug
drivers/Makefile