Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 1 Jun 2011 03:34:19 +0000 (20:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Jun 2011 03:34:19 +0000 (20:34 -0700)

Trivial merge