From: Olof Johansson <olof@lixom.net>
Date: Sun, 11 Dec 2011 23:57:59 +0000 (-0800)
Subject: Merge branch 'omap/omap1' into next/devel
X-Git-Tag: firefly_0821_release~3680^2~3791^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0fe422c9bd303e9bfbf9510b864266131152d390;p=firefly-linux-kernel-4.4.55.git

Merge branch 'omap/omap1' into next/devel
---

0fe422c9bd303e9bfbf9510b864266131152d390