summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/turbografx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-12 19:26:10 +0100
committerMark Brown <broonie@kernel.org>2016-01-12 19:26:10 +0100
commit78ae90255276d2cb9e4410df74b378cb9f8a8bbb (patch)
tree7237dfb44b0696dd791774d1896e5ecc73c0d55c /drivers/input/joystick/turbografx.c
parentMerge remote-tracking branches 'regulator/topic/lp8788', 'regulator/topic/mt6... (diff)
parentregulator: pv88090: logical vs bitwise AND typo (diff)
parentregulator: qcom-smd: Add support for PMA8084 (diff)
parentregulator: tps6105x: Convert to use regmap helper functions (diff)
parentregulator: tps65086: Update regulator driver for the TPS65086 PMIC (diff)
parentregulator: tps65218: add support for LS3 current regulator (diff)
downloadlinux-78ae90255276d2cb9e4410df74b378cb9f8a8bbb.tar.xz
linux-78ae90255276d2cb9e4410df74b378cb9f8a8bbb.zip
Merge remote-tracking branches 'regulator/topic/pv88090', 'regulator/topic/qcom-smd', 'regulator/topic/tps6105x', 'regulator/topic/tps65086' and 'regulator/topic/tps65218' into regulator-next