projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e40152e 670ff6a)
Merge branch 'topic/core-cleanup' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 20 May 2010 09:58:57 +0000 (11:58 +0200)
1  2 
sound/core/pcm_native.c patch | diff1 | diff2 | blob | history
sound/core/timer.c patch | diff1 | diff2 | blob | history

diff --cc sound/core/pcm_native.c
Simple merge
diff --cc sound/core/timer.c
Simple merge
Domain: System / Kernel;