Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Aug 2010 12:38:11 +0000 (13:38 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Aug 2010 12:38:11 +0000 (13:38 +0100)
commitd89ccac5a242a6547bcb8073f1ff65bdfa042266
tree7e0203a2af342ccb2638a8ccc8ab55948654955c
parent72fba57931c703ad71849b2521226c9bcb7d6688
parent70bf043b137aa9ff2711b16532774465e07a8f47
Merge branch 'for-2.6.36' into for-2.6.37
sound/soc/imx/imx-ssi.c