aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown2017-07-03 16:20:28 +0100
committerMark Brown2017-07-03 16:20:28 +0100
commit2a40f9421cb72d1d15618997b324f4169504ac09 (patch)
treef65dbeb606ac3340717042030b12b525a9863a29 /drivers
parent6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (diff)
parentc13be1d942c1e9c2250370f4dfc46031ade0802a (diff)
parenta71411dbf6c82ba2eb2519717c04ffb19bc4dda5 (diff)
parentf458e6102c1fe3a1d28bae85cdeb0cd66537c4fe (diff)
Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next