From: Mark Brown 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-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9183^2~1^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3d7e9cecc829bd85e18519602048bc705b93a560;p=mirror_ubuntu-artful-kernel.git Merge branch 'fix/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-cache Conflicts: drivers/base/regmap/regcache.c --- 3d7e9cecc829bd85e18519602048bc705b93a560