Merge branch 'topic/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Dec 2011 05:26:25 +0000 (13:26 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Dec 2011 05:26:25 +0000 (13:26 +0800)

Trivial merge