Merge branch 'topic/workq-update' into topic/asoc

Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c
This commit is contained in:
Takashi Iwai 2010-12-13 09:28:43 +01:00
commit 20aeeb356b
946 changed files with 16973 additions and 8345 deletions

Some files were not shown because too many files have changed in this diff Show more