]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Oct 2012 16:36:02 +0000 (17:36 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Oct 2012 16:36:02 +0000 (17:36 +0100)

Trivial merge