]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit0fc363cf740a59d7197bcb5de938a336e222e5f2
tree997fcfcc89a74f35509ad71460b51c050d7dbeb3
parent7a260fb8531c50e4a64db906ff5c7c11a072498f
parent2bbf6078dc948e87564c1a947f23ea4cf2349a13
Merge branch 'for-3.7' into asoc-next

Conflicts:
sound/soc/omap/am3517evm.c
sound/soc/omap/mcbsp.c