From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 8 Oct 2013 15:43:00 +0000 (-0700)
Subject: Merge tag 'v3.12-rc4' into next
X-Git-Tag: firefly_0821_release~176^2~541^2~234^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3c55d406bd8df1a878546002c93db90c42be10c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.12-rc4' into next

Merge with mainline to bring in changes to input subsystem that were
committed through other trees.
---

e3c55d406bd8df1a878546002c93db90c42be10c