Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Feb 2012 20:49:12 +0000 (15:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Feb 2012 20:49:12 +0000 (15:49 -0500)

Trivial merge