summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-10-29 12:14:39 -0600
committerMark Brown <broonie@kernel.org>2016-10-29 12:14:39 -0600
commit74e3368de87d5efb439b17d8e5108ebaf08224c2 (patch)
treebd3cbeb021459e15ff25c4689bd29fa4fb13deeb /include
parent07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff)
parentadf08d481b52824c87af028fc74dc692d179f7f4 (diff)
parent72193a953ada9058e46970838cc42cbd18bf4eba (diff)
Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus