Merge remote branch 'tiwai/topic/asoc' into for-2.6.38
authorLiam Girdwood <lrg@slimlogic.co.uk>
Wed, 3 Nov 2010 14:18:42 +0000 (14:18 +0000)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Wed, 3 Nov 2010 14:18:42 +0000 (14:18 +0000)

Trivial merge