Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:24:56 +0000 (13:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 21:24:56 +0000 (13:24 -0800)
commita5e3c2aae23a3719105c1ae662c67ef282f213db
treef951e78782757dfc2d4b7015601f65101ac2ef73
parent6b28ff3be829a851378551245fd6b3f9bf93b0ad
parent091b948306d2628320e77977eb7ae4a757b12180
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
net/batman-adv/vis.c