| commit | 18d4ed4342c14ebeebe60d267b171053efcdfa87 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 08 14:56:19 2011 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 08 14:56:19 2011 +0900 |
| tree | f315e77f66cbb70869e2f80cde5c18380a80901e | |
| parent | 722d0daf2b607a32dad1357bf797e3803484af0a [diff] | |
| parent | 22de4534ae12d61257fc0e53d2571686b03305bc [diff] |
Merge branch 'for-3.1' into for-3.2 Conflict due to the fix for the register map failure - taken the for-3.1 version. Conflicts: sound/soc/codecs/sgtl5000.c