summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 12:36:14 +0300
committerMark Brown <broonie@kernel.org>2016-05-13 12:36:14 +0300
commitd4ab78d7076d2a58a2d690b2f4a03a24d978ac1c (patch)
tree59bb25298e6996d02e900fcc871d1924fe66278e /drivers/base
parent2a2cd5219023ea2e485c3e37486c24177a6da55a (diff)
parent267c85860308d36bc163c5573308cd024f659d7c (diff)
parent6e4f28780f38e27cb7ca0edeb1d7ebb4edfd1fc5 (diff)
downloadlinux-d4ab78d7076d2a58a2d690b2f4a03a24d978ac1c.tar.xz
Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next