]> 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: 7a260fb 2bbf607)
Merge branch 'for-3.7' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:21:29 +0000 (20:21 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Aug 2012 19:21:29 +0000 (20:21 +0100)
Conflicts:
sound/soc/omap/am3517evm.c

1  2 
sound/soc/omap/mcbsp.c patch | diff1 | diff2 | blob | history

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