]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
drivers/base/regmap/regcache.c


Trivial merge