| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Apr 18 18:07:43 2011 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Apr 18 18:07:43 2011 +0100 |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 [diff] | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 [diff] |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40 Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c