From: John Stultz <john.stultz@linaro.org>
Date: Mon, 25 Nov 2013 18:54:08 +0000 (-0800)
Subject: Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
X-Git-Tag: firefly_0821_release~3680^2~4^2~39^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c6193b7527e92a5916e6f798ddf47401afa17c3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

Update to latest android-3.10 branch.

Minor conflict with the direct printk stuff

Signed-off-by: John Stultz <john.stultz@linaro.org>
---

2c6193b7527e92a5916e6f798ddf47401afa17c3