]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Dec 2011 00:26:07 +0000 (19:26 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Dec 2011 00:26:07 +0000 (19:26 -0500)

Trivial merge