Merge branch 'topic/lzo' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 6 Jun 2017 19:10:47 +0000 (20:10 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jun 2017 19:10:47 +0000 (20:10 +0100)
commitc13be1d942c1e9c2250370f4dfc46031ade0802a
tree14b133ac083f5b4f6015c28615553cd78dd4f6fa
parentcc5d0db390b0ff0f5da95b643a2b070da15a9c3e
parent34a730aa74c7c743f4ca9635e0d0b2479d6ed53c
Merge branch 'topic/lzo' of git://git./linux/kernel/git/broonie/regmap into regmap-1wire
drivers/base/regmap/Kconfig
drivers/base/regmap/Makefile