]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 095d79d da403f8)
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Dec 2011 12:02:29 +0000 (12:02 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Dec 2011 12:02:29 +0000 (12:02 +0000)
1  2 
sound/soc/mxs/mxs-pcm.c patch | diff1 | diff2 | blob | history

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