Merge branch 'for-2.6.32' into mxc
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Aug 2009 10:20:44 +0000 (11:20 +0100)
Conflicts:
sound/soc/Makefile


Trivial merge