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)

Trivial merge