Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 Sep 2011 19:25:47 +0000 (15:25 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Sep 2011 19:25:47 +0000 (15:25 -0400)

Trivial merge