From: Mark Brown <broonie@kernel.org>
Date: Mon, 20 Oct 2014 16:49:49 +0000 (+0100)
Subject: Merge branch 'fix/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d7e9cecc829bd85e18519602048bc705b93a560;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'fix/cache' of git://git./linux/kernel/git/broonie/regmap into regmap-cache

Conflicts:
	drivers/base/regmap/regcache.c
---

3d7e9cecc829bd85e18519602048bc705b93a560