From: John Stultz <john.stultz@linaro.org>
Date: Fri, 13 Dec 2013 00:31:19 +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
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5ef3c884d2291f784bc7c08f48112b04ffbb2f8d;p=firefly-linux-kernel-4.4.55.git

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

Pull in updates from AOSP, mostly focused on ION

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

5ef3c884d2291f784bc7c08f48112b04ffbb2f8d