diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 17:49:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 17:49:49 +0100 |
| commit | 3d7e9cecc829bd85e18519602048bc705b93a560 (patch) | |
| tree | 853f7f6971a9d336adb2d32a6a9ac12feb4bc753 /drivers/base | |
| parent | fb70067e4a2cc45d273864f071fd6cf62143137a (diff) | |
| parent | 439e8211a78ad31615c76b18e4f13eb900c89758 (diff) | |
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
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions