summaryrefslogtreecommitdiff
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-04 11:02:10 +0000
committerMark Brown <broonie@kernel.org>2015-11-04 11:02:10 +0000
commitfc579056af0bdaf9944e2c023c06ae9251cde3c0 (patch)
treed683bd9c0f669ab45a945722d18a812445a0cf47 /drivers/input/joystick
parent8a9e77653fc2bc8590a471b58097f258248b9369 (diff)
parent5a60adafb95263d63dfaaf7168680c4b7e50b370 (diff)
parent85c1912d44081173b9cd796955959a8201aa7a4e (diff)
parent37457607ecaffe56718a0e423548edeb3d4a11b7 (diff)
parent45a3e771085d16c95eb54f8009d795941b21fb28 (diff)
parent8cf3af32902d14f6a0fbc4ad9a3025d9e7d4701b (diff)
Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/mpc512x', 'spi/topic/mtk', 'spi/topic/oc-tiny' and 'spi/topic/octeon' into spi-next