Merge branch 'fix/asoc' into for-linus
commitea78484bd508d582f543ff727c9a53a381c15895
authorTakashi Iwai <tiwai@suse.de>
Sun, 2 Jan 2011 10:01:55 +0000 (2 11:01 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 2 Jan 2011 10:01:55 +0000 (2 11:01 +0100)
tree4c5499468a4276d88fc0976be2f23a3ba72b5694
parente03fa055bc126e536c7f65862e08a9b143138ea9
parent776065e36de1d5eb9e33ff908352fef4050ab38d
Merge branch 'fix/asoc' into for-linus