Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 18:34:58 +0000 (19:34 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 18:34:58 +0000 (19:34 +0100)
commitbd4f2acb8dfbff473f1abe805bca902720f653b4
tree1a64f671d540ed36caf28c4fa834625e1955a168
parent78bf3c9ab69a957dfa58e521ce7fca056c86b980
parentfd137e2bba53b7207cbae6a1312e89ef3ae55624
Merge branch 'for-3.0' into for-3.1
sound/soc/soc-cache.c