From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 13 Dec 2010 08:28:43 +0000 (+0100)
Subject: Merge branch 'topic/workq-update' into topic/asoc
X-Git-Tag: v2.6.38-rc1~236^2^2~55^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20aeeb356ba2e8daa99b5942c528ae2b3ea28433;p=pandora-kernel.git

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
---

20aeeb356ba2e8daa99b5942c528ae2b3ea28433
Reading git-diff-tree failed