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: v3.13-rc1~65^2^2~20
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/e3c55d406bd8df1a878546002c93db90c42be10c

Merge tag 'v3.12-rc4' into next

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

e3c55d406bd8df1a878546002c93db90c42be10c