summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2017-04-27 09:24:41 +0100
committerLee Jones <lee.jones@linaro.org>2017-04-27 09:24:41 +0100
commit18973ceb89d5022992e5707e2b0a268ddc39b7e0 (patch)
tree350255d011a6177070ff8553bc16d9f92d18b370 /drivers/input
parent9f7c7ceefe5e824e8333859bded12257a6d3548a (diff)
parentb2d476404601806c5a94a5f9bfc441d3898a5541 (diff)
parent6d99971842f6b0779738d8c168d9ed92ef1ff5fc (diff)
parent4f9ab0c1570800002e77515888600ca2e3dce4a9 (diff)
parentf7f6c060547c51691f9b943e6c33f63675c1a0a9 (diff)
parente1d7eb0c8fc9c33ef60ac31172fb0fbb78c24271 (diff)
downloadlinux-18973ceb89d5022992e5707e2b0a268ddc39b7e0.tar.bz2
Merge branches 'ib-mfd-gpio-4.12', 'ib-mfd-iio-input-4.12', 'ib-mfd-input-4.12', 'ib-mfd-leds-4.12', 'ib-mfd-phy-4.12' and 'ib-mfd-pinctrl-samsung-4.12' into ibs-for-mfd-merged