Merge branch 'fix/asoc' into for-linus
commitc9de36f2a230919bee95f05ba27ed10ce4850409
authorTakashi Iwai <tiwai@suse.de>
Thu, 29 Jan 2009 13:47:53 +0000 (29 14:47 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 29 Jan 2009 13:47:53 +0000 (29 14:47 +0100)
tree638feea930da60827ad3c6d7c321b0aa38adc399
parent18e352e4a73465349711a9324767e1b2453383e2
parentef390c0b6e3f4d2d2d43f53f4bd35e1884571a14
Merge branch 'fix/asoc' into for-linus