projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a84364 72077aa)
Merge branch 'topic/ca0106-resume' into topic/ca0106
authorTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:43:00 +0000 (23:43 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:43:00 +0000 (23:43 +0100)
1  2 
sound/pci/ca0106/ca0106.h patch | diff1 | diff2 | blob | history
sound/pci/ca0106/ca0106_main.c patch | diff1 | diff2 | blob | history

diff --cc sound/pci/ca0106/ca0106.h
Simple merge
diff --cc sound/pci/ca0106/ca0106_main.c
Simple merge
Domain: System / Uncategorized;