summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 14:39:34 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 14:39:34 +0100
commit176175b613cb560a33839838c3baa817c9e218ca (patch)
tree500369092c97b4941097039213b8ff1abbc657e1 /drivers/input
parent11f24823667400983a05e6099d645f523d1989ef (diff)
parent804486b19de92449203f95027c2b207d8c5d5c79 (diff)
parent6cb6e6be41b5b42370e9028d7b691803295b097e (diff)
parentee3010d0ab288d1c307464c1bd1dc3bf16aca7e4 (diff)
parentb10c7f3cc948107fb992d3a14eeaa0fdfb5c95da (diff)
Merge remote-tracking branches 'regulator/topic/lp872x', 'regulator/topic/ltc3589', 'regulator/topic/max77693' and 'regulator/topic/max8973' into regulator-next