]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66b47fd 6377278)
Merge branch 'for-2.6.35' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Jul 2010 11:29:10 +0000 (12:29 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 13 Jul 2010 11:29:10 +0000 (12:29 +0100)
1  2 
sound/soc/sh/fsi.c patch | diff1 | diff2 | blob | history

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