]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f7e795 25b7679)
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Aug 2011 07:34:05 +0000 (16:34 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Aug 2011 07:34:05 +0000 (16:34 +0900)
1  2 
sound/soc/soc-pcm.c patch | diff1 | diff2 | blob | history

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