From: Mark Brown <broonie@linaro.org>
Date: Fri, 13 Dec 2013 18:52:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~184
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=358194677ff980dd058b521295f3f76c20cfdfc8;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
	drivers/staging/android/ion/ion_chunk_heap.c
	kernel/printk.c
---

358194677ff980dd058b521295f3f76c20cfdfc8