summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-22 19:26:07 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-22 19:26:07 +0100
commit38e23194e1c95e73819d25a63bcf94fe4709d4c5 (patch)
tree42a7d1e2f3778adcd13a4376ae9e0810ef6d387b /drivers/base
parent463351194d826af7ae97fff0ed6f0fe2a4fed615 (diff)
parenta43fd50dc99a5f65505f174eca5a421707d73b4c (diff)
parent632a5b01db8cd4068a06f8a67720ea4f9b00d9b3 (diff)
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
Conflicts (trivial context stuff): drivers/base/regmap/regmap.c include/linux/regmap.h