]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 4 Oct 2012 17:57:34 +0000 (18:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 4 Oct 2012 17:57:34 +0000 (18:57 +0100)

Trivial merge