git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b34c866 f1e6d3c)
Merge branch 'topic/usb-audio' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:33:07 +0000 (15:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:33:07 +0000 (15:33 +0200)
* topic/usb-audio:
  ALSA: usb-audio - Fix types taken in min()
  sound: usb-audio: do not make URBs longer than sync packet interval
  sound: usb-audio: add MIDI drain callback
  sound: usb-audio: use multiple output URBs
  sound: usb-audio: use multiple input URBs
  sound: usb-audio: Xonar U1 digital output support

1  2 
sound/usb/usbaudio.c patch | diff1 | diff2 | blob | history
sound/usb/usbmixer.c patch | diff1 | diff2 | blob | history

diff --cc sound/usb/usbaudio.c
Simple merge
diff --cc sound/usb/usbmixer.c
Simple merge
Pandora Kernel Repository