From: Takashi Iwai Date: Fri, 19 Dec 2008 14:36:58 +0000 (+0100) Subject: Merge branch 'fix/asoc' into topic/asoc X-Git-Tag: v2.6.29-rc1~590^2~11^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=70043058a6968917c00c8d4cff5bfc0e095831ec;p=users%2Fjedix%2Flinux-maple.git Merge branch 'fix/asoc' into topic/asoc --- 70043058a6968917c00c8d4cff5bfc0e095831ec