Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Dec 2016 17:31:17 +0000 (09:31 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 16 Dec 2016 17:31:17 +0000 (09:31 -0800)
Prepare input updates for 4.10 merge window.

1  2 
drivers/input/serio/i8042-x86ia64io.h

Simple merge