projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd9d95a c97259d)
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...
authorJaroslav Kysela <perex@perex.cz>
Fri, 8 Jan 2010 08:11:18 +0000 (09:11 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 8 Jan 2010 08:11:18 +0000 (09:11 +0100)
1  2 
sound/core/pcm_lib.c patch | diff1 | diff2 | blob | history
sound/pci/hda/patch_conexant.c patch | diff1 | diff2 | blob | history

diff --cc sound/core/pcm_lib.c
Simple merge
diff --cc sound/pci/hda/patch_conexant.c
Simple merge
Domain: System / Uncategorized;