Merge branch 'topic/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 12 Dec 2011 16:10:45 +0000 (00:10 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 12 Dec 2011 16:10:45 +0000 (00:10 +0800)

Trivial merge