Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Aug 2011 16:26:38 +0000 (18:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Aug 2011 16:26:38 +0000 (18:26 +0200)
commitc012cdc858db36ff2314469930bfcfb00eef6f29
tree6038ccd1dec55f82642f6036a75af57cb6b2a921
parent15439bde3af7ff88459ea2b5520b77312e958df2
parentf6b864a9071e21186476910613ec9913b56067a2
Merge branch 'fix/asoc' into for-linus