Merge branch 'for-next' into for-linus
commit424c3d4a2c7d4ac3467a4849f8ccc230f670c35a
authorLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 1 Aug 2011 17:25:06 +0000 (1 18:25 +0100)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 1 Aug 2011 17:25:06 +0000 (1 18:25 +0100)
tree55806b1367b42ec210f273c16bf350182ac6fd62
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
parent88cda60e512373ca18a663ee66dc2550800223eb
Merge branch 'for-next' into for-linus
sound/soc/codecs/tlv320aic3x.c