From: Mark Brown <broonie@kernel.org>
Date: Sat, 10 Jan 2015 11:54:47 +0000 (+0000)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~38
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2ac82c9d0b5898426a9379d8c3855b03614dbf6;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm/include/asm/hardware/coresight.h
	arch/arm/kernel/etm.c
---

a2ac82c9d0b5898426a9379d8c3855b03614dbf6