Merge branch 'fix/asoc' into for-linus
commitf3f1e14ce993775b7373defeffb5ebd5844fcb98
authorTakashi Iwai <tiwai@suse.de>
Sun, 31 Jan 2010 13:41:05 +0000 (31 14:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 31 Jan 2010 13:41:05 +0000 (31 14:41 +0100)
tree6c894bbb4a0dab2235770b6690898c44611bab35
parent74ce25c0ee757b0b9ea16a67a9ddc0ced192b030
parent5bbd4953a4fb5d8d597b4a53b8da97eee320b634
Merge branch 'fix/asoc' into for-linus