]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5381e4 61a6d07)
Merge branch 'tegra' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:08:22 +0000 (18:08 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:08:22 +0000 (18:08 +0100)
1  2 
sound/soc/tegra/harmony.c patch | diff1 | diff2 | blob | history

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