Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 22 Jun 2015 16:26:29 +0000 (09:26 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 22 Jun 2015 16:26:29 +0000 (09:26 -0700)
Prepare first round of input updates for 4.2 merge window.

1  2 
drivers/input/mouse/alps.c

Simple merge