Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...
Jaroslav Kysela [Fri, 16 Apr 2010 08:37:41 +0000 (10:37 +0200)]
1  2 
sound/usb/caiaq/device.c
sound/usb/usx2y/us122l.c

Simple merge
Simple merge