| commit | a7e828896d5d131b58088e3ea076b865caf12663 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 15 22:48:19 2011 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Aug 15 22:48:19 2011 +0900 |
| tree | a665e66480bd4a060e336421553268c71a2c304b | |
| parent | b21a415d78201bd10f99ea995e757eec5d344e48 [diff] | |
| parent | 0cc62e926324d4f3bd02d378baafbe73164fca35 [diff] |
Merge branch 'for-3.1' into for-3.2 Remove the bodge for ad193x. Conflicts: sound/soc/soc-io.c