projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d62ab35 b5ab887)
Merge branch 'upstream/wm8711' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Sep 2009 11:54:21 +0000 (04:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Sep 2009 11:54:21 +0000 (04:54 -0700)
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