From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 24 Nov 2012 08:02:54 +0000 (-0800)
Subject: Merge branch 'for-linus' into next
X-Git-Tag: firefly_0821_release~176^2~541^2~298^2~30
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' into next

Bring in changes to ads7846 to avoid mereg conflicts.
---

5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1