Merge branch 'fix/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 16:49:49 +0000 (17:49 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 16:49:49 +0000 (17:49 +0100)
commit3d7e9cecc829bd85e18519602048bc705b93a560
tree853f7f6971a9d336adb2d32a6a9ac12feb4bc753
parentfb70067e4a2cc45d273864f071fd6cf62143137a
parent439e8211a78ad31615c76b18e4f13eb900c89758
Merge branch 'fix/cache' of git://git./linux/kernel/git/broonie/regmap into regmap-cache

Conflicts:
drivers/base/regmap/regcache.c