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)
Second round of input updates for 3.19.

1  2 
drivers/input/keyboard/stmpe-keypad.c
drivers/input/mouse/alps.c

Simple merge
Simple merge