From: Olof Johansson <olof@lixom.net>
Date: Wed, 14 Dec 2011 03:35:03 +0000 (-0800)
Subject: Merge branch 'orion/devel' into next/devel
X-Git-Tag: firefly_0821_release~3680^2~3791^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2da994e687f7991cc76e3270c423bf6500b9424a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'orion/devel' into next/devel
---

2da994e687f7991cc76e3270c423bf6500b9424a