From: Linus Torvalds Date: Wed, 25 Jan 2012 23:11:57 +0000 (-0800) Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap X-Git-Tag: v3.12-rc1~3961 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ca4e8c43888f1794485f48c847cb3c9b7272a7d;p=kernel%2Fkernel-generic.git Merge tag 'for-linus' of git://git./linux/kernel/git/broonie/regmap A fairly simple bugfix for a WARN_ON() which was triggered in the cache reset support as a result of some subsequent work. There's only one mainline user for the code path that's updated right now (wm8994) so should be low risk. * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: Reset cache status when reinitialsing the cache --- 7ca4e8c43888f1794485f48c847cb3c9b7272a7d