summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-12-13 12:55:39 +0100
committerTakashi Iwai <tiwai@suse.de>2010-12-13 12:58:59 +0100
commitfdea0571ddca8e3f22448f66d72a034575abea28 (patch)
treee16a5a57e667eb9b3f442ac6dd4509a0c20b57d8 /README
parentMerge branch 'topic/workq-update' into topic/asoc (diff)
downloadlinux-fdea0571ddca8e3f22448f66d72a034575abea28.tar.xz
linux-fdea0571ddca8e3f22448f66d72a034575abea28.zip
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>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions