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)
commit7b415285ae96f5bfa0fa95d3227c6900c4ff151d
treefeb5198f57bfb5b58aca24ddc76a313236f94512
parentc65cf815653ec64e73d40819806c2d1aed91681e
parent049e6dde7e57f0054fdc49102e7ef4830c698b46
Merge tag 'v4.3-rc4' into next

Merge with mainline to sync up with changes to parkbd driver.
drivers/input/joystick/walkera0701.c