projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cdf745 dde7ad8)
Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 26 Oct 2011 21:51:43 +0000 (23:51 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Oct 2011 21:51:43 +0000 (23:51 +0200)
1  2 
include/sound/pcm.h patch | diff1 | diff2 | blob | history
sound/core/pcm_native.c patch | diff1 | diff2 | blob | history
sound/usb/card.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/card.c
Simple merge