Merge branch 'for-2.6.34' of git://opensource.wolfsonmicro.com/linux-2.6-asoc into...
Takashi Iwai [Thu, 25 Feb 2010 18:44:00 +0000 (19:44 +0100)]

Trivial merge