Merge branch 'topic/workq-update' into topic/asoc
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 08:28:43 +0000 (09:28 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 08:28:43 +0000 (09:28 +0100)
commit20aeeb356ba2e8daa99b5942c528ae2b3ea28433
treed2cebc7039954851998d592123899f5627def7a9
parent07a9e2b2fbdda631eeff54e4b8ebcaaea71be538
parent5b84ba26a9672e615897234fa5efd3eea2d6b295
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
MAINTAINERS
arch/arm/mach-shmobile/board-ap4evb.c
arch/sh/boards/mach-se/7724/setup.c
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c