Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Dec 2011 20:06:33 +0000 (15:06 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Dec 2011 20:06:33 +0000 (15:06 -0500)

Trivial merge