Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Aug 2011 13:48:19 +0000 (22:48 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Aug 2011 13:48:19 +0000 (22:48 +0900)
commita7e828896d5d131b58088e3ea076b865caf12663
treea665e66480bd4a060e336421553268c71a2c304b
parentb21a415d78201bd10f99ea995e757eec5d344e48
parent0cc62e926324d4f3bd02d378baafbe73164fca35
Merge branch 'for-3.1' into for-3.2

Remove the bodge for ad193x.

Conflicts:
sound/soc/soc-io.c