From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 13 Dec 2010 11:55:39 +0000 (+0100)
Subject: ASoC: Fix merge errors with flush_scheduled_work() removal
X-Git-Tag: v2.6.38-rc1~236^2^2~55^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdea0571ddca8e3f22448f66d72a034575abea28;p=pandora-kernel.git

ASoC: Fix merge errors with flush_scheduled_work() removal

delayed_work was moved to dapm in the commit
ce6120cca2589ede530200c7cfe11ac9f144333c
    ASoC: Decouple DAPM from CODECs

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

Reading git-diff-tree failed