]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6478e1380aaf49a7777d279487555f5bedd45bab
treed2cebc7039954851998d592123899f5627def7a9
parent6972c42e7992674ec8d6e4cd2c49a9513dadc5ea
parentf34981c68e241f655831a18fe5db46d095a7fbfe
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