Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...

author Jaroslav Kysela <[email protected]>

Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)

committer Jaroslav Kysela <[email protected]>

Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
author Jaroslav Kysela <[email protected]>
Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
committer Jaroslav Kysela <[email protected]>
Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
diff --cc sound/usb/caiaq/device.c
Simple merge
diff --cc sound/usb/usx2y/us122l.c
Simple merge
author	Jaroslav Kysela <[email protected]>
	Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
committer	Jaroslav Kysela <[email protected]>
	Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)
		1	2
sound/usb/caiaq/device.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usx2y/us122l.c	patch \|	diff1 \|	diff2 \|	blob \| history