Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 18 Dec 2014 18:02:39 +0000 (10:02 -0800)
commit6d32af019a45654b6eb3ae2ff17d51ba1f045bb4
tree17d232cb65248c68b86aaec475f576b5134079e2
parentf20c86cd75f1c8c728dafd0218645ff3c5e8545d
parent27a560ba1d4f0a07a36e1de2cae839abe776e8f3
Merge branch 'next' into for-linus

Second round of input updates for 3.19.
drivers/input/keyboard/stmpe-keypad.c
drivers/input/mouse/alps.c