Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 02:45:12 +0000 (19:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jul 2011 02:45:12 +0000 (19:45 -0700)
commitf8bae99ee5030625a4e7f0d87784191882292f0e
tree991cd2aff1ec1b74d1e3c658eb2ea09b0f93e5bd
parent994635a137f637466d36a7c6272dae014a46a11c
parent44c4349a2a117b22a5c4087f2ac9faf10c575e17
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge