projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03cfbdf 559a8cd)
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 06:20:30 +0000 (07:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 06:20:30 +0000 (07:20 +0100)
1  2 
sound/soc/codecs/Kconfig patch | diff1 | diff2 | blob | history
sound/soc/codecs/Makefile patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
John Crispins staging tree