Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
David S. Miller [Tue, 27 Sep 2011 19:05:47 +0000 (15:05 -0400)]

Trivial merge