Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 7 Mar 2011 08:37:13 +0000 (00:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Mar 2011 08:37:13 +0000 (00:37 -0800)

Trivial merge