Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 03:54:14 +0000 (19:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 03:54:14 +0000 (19:54 -0800)

Trivial merge