From: Takashi Iwai Date: Thu, 2 Dec 2010 16:33:53 +0000 (+0100) Subject: Merge branch 'fix/asoc' into for-linus X-Git-Tag: v2.6.37-rc5~11^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2ff38c9fbaa86264ad819117ab137361067ab5f1;p=users%2Fjedix%2Flinux-maple.git Merge branch 'fix/asoc' into for-linus --- 2ff38c9fbaa86264ad819117ab137361067ab5f1