]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1e090135f82bc63cf2356c3f6223d139b71bfe10
treea665e66480bd4a060e336421553268c71a2c304b
parent265cf9eafbda159e5030cb11bb8f59b58ce5dc5a
parent71c06bd71f9b386165937e4f851b730e0737d489
Merge branch 'for-3.1' into for-3.2

Remove the bodge for ad193x.

Conflicts:
sound/soc/soc-io.c