git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dea75c ae1ec5e)
Merge branch 'topic/pcm-delay' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 10 Jun 2009 05:26:40 +0000 (07:26 +0200)
* topic/pcm-delay:
  ALSA: usbaudio - Add delay account
  ALSA: Add extra delay count in PCM

1  2 
include/sound/pcm.h patch | diff1 | diff2 | blob | history
sound/core/pcm_native.c patch | diff1 | diff2 | blob | history
sound/usb/usbaudio.c patch | diff1 | diff2 | blob | history

diff --cc include/sound/pcm.h
Simple merge
diff --cc sound/core/pcm_native.c
Simple merge
diff --cc sound/usb/usbaudio.c
Simple merge
Full containers within linux kernel