]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d080732 b1c86bb)
Merge branch 'topic/usb-audio' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
1  2 
sound/usb/usbaudio.c patch | diff1 | diff2 | blob | history
sound/usb/usbmixer.c patch | diff1 | diff2 | blob | history
sound/usb/usbquirks.h patch | diff1 | diff2 | blob | history

diff --cc sound/usb/usbaudio.c
Simple merge
diff --cc sound/usb/usbmixer.c
Simple merge
diff --cc sound/usb/usbquirks.h
Simple merge
Clone of davem's net-next-2.6 tree