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)
commit08229de4b42816079ed5d15f0689fcd0af946d5e
tree7126dc7b220fbbce745cb5d9a8864e9690587da4
parentfbb474dedab871c7382858c374acd287dad4ab38
parent2a708137fd7d3e0928f27157aaed8aba404b11c9
Merge branch 'for-2.6.32' into mxc

Conflicts:
sound/soc/Makefile
sound/soc/Makefile