Merge tag 'v4.3-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 6 Oct 2015 00:36:38 +0000 (17:36 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 6 Oct 2015 00:36:38 +0000 (17:36 -0700)
Merge with mainline to sync up with changes to parkbd driver.

1  2 
drivers/input/joystick/walkera0701.c

Simple merge