]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dff2836 3bdf28f)
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 19:22:43 +0000 (20:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 19:22:43 +0000 (20:22 +0100)
1  2 
sound/soc/codecs/wm8996.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/wm8996.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.