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)
commit85a3685852d9ac7d92be9d824533c915a4597fa4
treeb7c542e2061cf96c9f7ad500fa12567f9ff0b39f
parent92bac83dd79e60e65c475222e41a992a70434beb
parent8b8a518ef16be2de27207991e32fc32b0475c767
Merge branch 'next' into for-linus

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