From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 25 Jul 2012 05:43:04 +0000 (-0700)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: firefly_0821_release~176^2~541^2~331
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=314820c9e892d8f41ba4db300ec96770d9c8294b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next' into for-linus
---

314820c9e892d8f41ba4db300ec96770d9c8294b