Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 14 Apr 2015 15:51:33 +0000 (08:51 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 14 Apr 2015 15:51:33 +0000 (08:51 -0700)
Prepare first round of input updates for 4.1 merge window.

1  2 
drivers/input/mouse/alps.c

Simple merge