Merge branch 'for-3.2' into for-3.3

Conflicts:
	sound/soc/mxs/mxs-pcm.c
This commit is contained in:
Mark Brown 2011-12-11 11:24:44 +08:00
commit 43a9519758
2 changed files with 4 additions and 0 deletions