| commit | 15086ded21ee7f065ad290c1edfdc49cf18cf96e | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 09 12:37:42 2011 +0000 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Wed Mar 09 12:37:42 2011 +0000 |
| tree | 97b509b33d08a83dcd93406acfeccde4f2843ba5 | |
| parent | 3e5ff4dfa5a0a5627235a245665035597f050d86 [diff] | |
| parent | 28e868081086c495c897a48c50d2d5187ef677d2 [diff] |
Merge branch 'for-2.6.38' into for-2.6.39 Conflicts: sound/soc/codecs/wm8978.c sound/soc/soc-dapm.c