Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Feb 2015 19:35:36 +0000 (11:35 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 10 Feb 2015 19:35:36 +0000 (11:35 -0800)
Prepare first round of input updates for 3.20.

1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/input/mouse/synaptics.c
drivers/input/serio/i8042.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge