Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap...
authorMark Brown <broonie@kernel.org>
Sat, 29 Oct 2016 18:14:39 +0000 (12:14 -0600)
committerMark Brown <broonie@kernel.org>
Sat, 29 Oct 2016 18:14:39 +0000 (12:14 -0600)
1  2  3 
include/linux/regmap.h

Simple merge