Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
David S. Miller [Thu, 20 Oct 2011 21:40:43 +0000 (17:40 -0400)]

Trivial merge