]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d2019f 838c364)
Merge remote branch 'alsa/devel' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:56:12 +0000 (13:56 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 11 Oct 2010 11:56:12 +0000 (13:56 +0200)
1  2 
sound/core/oss/mixer_oss.c patch | diff1 | diff2 | blob | history

diff --cc sound/core/oss/mixer_oss.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.