| commit | 6010c4c6c8e60bece2d71173c96400bcd0aae792 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Oct 02 20:20:35 2011 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sun Oct 02 20:20:35 2011 +0100 |
| tree | 56ba38b871fe6851b4d98da62e18b70d5f081feb | |
| parent | 4b8713fd5459619ba8a5a43afcfe7b47a57a8d82 [diff] | |
| parent | b5c49d49b9e175fd56cb4b5cf2c4fd972d15e013 [diff] |
Merge branch 'for-3.1' into for-3.2 Conflicts: sound/soc/omap/mcpdm.c sound/soc/omap/mcpdm.h