From: Olof Johansson <olof@lixom.net>
Date: Fri, 28 Jun 2013 00:04:00 +0000 (-0700)
Subject: Merge branch 'msm/fixes' into next/late
X-Git-Tag: firefly_0821_release~176^2~5836^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fbd1a04b210d56ef84200df56fc0291746d4d4dc;p=firefly-linux-kernel-4.4.55.git

Merge branch 'msm/fixes' into next/late

Merging in msm/fixes to avoid silly conflicts at top level.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

fbd1a04b210d56ef84200df56fc0291746d4d4dc