From: Takashi Iwai Date: Fri, 12 Aug 2011 16:26:38 +0000 (+0200) Subject: Merge branch 'fix/asoc' into for-linus X-Git-Tag: v3.1-rc2~4^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c012cdc858db36ff2314469930bfcfb00eef6f29;p=users%2Fhch%2Fblock.git Merge branch 'fix/asoc' into for-linus --- c012cdc858db36ff2314469930bfcfb00eef6f29