Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Jul 2011 15:44:57 +0000 (08:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Jul 2011 15:44:57 +0000 (08:44 -0700)
commit3f9aed7c7d517dbc717a97649d0a5a9dc80bf4f2
treebed215245dc32aea477c76f7124e6af13ba362ac
parent31817df025e24559a01d33ddd68bd11b21bf9d7b
parenta7f9becb7d27008af0f72f8449c110276b0df37d
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge