Merge branch 'fix/asoc' into for-linus
commit60b1ae0cd469825e4db0837f5f19c3a8084300c3
authorTakashi Iwai <tiwai@suse.de>
Mon, 8 Aug 2011 12:30:44 +0000 (8 14:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 8 Aug 2011 12:30:44 +0000 (8 14:30 +0200)
tree563aafa40012d1bb8218987ffeb76c88743e18e5
parent0a2d31b62dba9b5b92a38c67c9cc42630513662a
parent8c285645ab3b05942124020b5f0b89d3b539823a
Merge branch 'fix/asoc' into for-linus