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)
commitf7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1
tree650c1748df35728e2bce1b8c26c064bfea272f63
parent469d7d22cea146e40efe8c330e5164b4d8f13934
parent84c88ef9affb34f10cb5b66b07e2d496845d1c28
Merge branch 'next' into for-linus

Prepare first round of input updates for 4.2 merge window.
drivers/input/mouse/alps.c