Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
David S. Miller [Wed, 6 Jul 2011 02:45:12 +0000 (19:45 -0700)]

Trivial merge