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)

Trivial merge