Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
1  2 
sound/usb/card.c
sound/usb/endpoint.c
sound/usb/pcm.c

Simple merge
Simple merge
diff --cc sound/usb/pcm.c
Simple merge