]> git.karo-electronics.de Git - mv-sheeva.git/commit
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 20aeeb3) | patch
ASoC: Fix merge errors with flush_scheduled_work() removal
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:55:39 +0000 (12:55 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 11:58:59 +0000 (12:58 +0100)
commitfdea0571ddca8e3f22448f66d72a034575abea28
treee16a5a57e667eb9b3f442ac6dd4509a0c20b57d8tree | snapshot
parent20aeeb356ba2e8daa99b5942c528ae2b3ea28433commit | diff
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>
sound/soc/codecs/wm8350.c diff | blob | history
sound/soc/codecs/wm8753.c diff | blob | history
Linux for Marvell Sheeva based platforms