]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28b349f ec2e303)
Merge branch 'for-3.5' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 18 Apr 2012 17:23:17 +0000 (18:23 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 18 Apr 2012 17:23:17 +0000 (18:23 +0100)
1  2 
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/soc-dapm.c
Simple merge
Linux kernel for KaRo TX COM modules