Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@conan.davemloft.net>
Sun, 15 May 2011 02:47:51 +0000 (22:47 -0400)
committerDavid S. Miller <davem@conan.davemloft.net>
Sun, 15 May 2011 02:47:51 +0000 (22:47 -0400)

Trivial merge