From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 2 Mar 2010 10:27:46 +0000 (+0100)
Subject: Merge remote branch 'alsa/devel' into topic/misc
X-Git-Tag: firefly_0821_release~9833^2~2092^2~2^2~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=156366d31524dc6b88836f06dccb1be13dbef5f1;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'alsa/devel' into topic/misc

Conflicts:
	sound/usb/usbaudio.c
---

156366d31524dc6b88836f06dccb1be13dbef5f1