Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Apr 2011 08:05:30 +0000 (10:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Apr 2011 08:05:30 +0000 (10:05 +0200)
commit664cee46e755b37204f1731cb8726db610f3486d
tree11ed0d43eff14123534785cf25c0a2143e134e7e
parenta0334c50bf0ba7c720ed00f931e721c989efd233
parent4e29402fe4b2006c994eed5020c42b2cc87d9b42
Merge branch 'fix/asoc' into for-linus