]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge remote branch 'takashi/fix/asoc' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Nov 2010 16:32:54 +0000 (12:32 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Nov 2010 16:32:54 +0000 (12:32 -0400)

Trivial merge