Merge branch 'for-2.6.35' into for-2.6.36
commit4d53952a396d7fcde295b6eedee1f588dfb8464c
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Jul 2010 11:29:10 +0000 (13 12:29 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Jul 2010 11:29:10 +0000 (13 12:29 +0100)
tree0a38a0b60d5506000c098556a6f2ddb60ecc75d6
parent66b47fdb851924956b6e4696fb43a3496ae2c462
parent637727838a5e82bc9285ab078a793eaae590bacb
Merge branch 'for-2.6.35' into for-2.6.36
sound/soc/sh/fsi.c