| commit | 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Mon Dec 13 09:28:43 2010 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Mon Dec 13 09:28:43 2010 +0100 |
| tree | d2cebc7039954851998d592123899f5627def7a9 | |
| parent | 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 [diff] | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 [diff] |
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