Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 12 Jan 2016 01:47:25 +0000 (17:47 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 12 Jan 2016 01:47:25 +0000 (17:47 -0800)
Prepare first round of input updates for 4.5 merge window.

1  2 
drivers/input/joystick/walkera0701.c

Simple merge