]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ab97f2 9203dd0)
Merge branch 'topic/hdmi' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 22 May 2015 14:04:45 +0000 (16:04 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 22 May 2015 14:04:45 +0000 (16:04 +0200)
1  2 
sound/core/Kconfig patch | diff1 | diff2 | blob | history
sound/core/Makefile patch | diff1 | diff2 | blob | history

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