tree 5ae1fee7169edd9bebace22394f0777af21fca63
parent 7f9320d415fab5c05097c77eea7a77f2f6341f24
parent 0a566ec25627bdd360f7294aa2e52f9d121233b4
author Takashi Iwai <tiwai@suse.de> 1267525666 +0100
committer Takashi Iwai <tiwai@suse.de> 1267525666 +0100

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

Conflicts:
	sound/usb/usbaudio.c