Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
David S. Miller [Mon, 31 Jan 2011 21:24:56 +0000 (13:24 -0800)]
1  2 
net/batman-adv/vis.c

Simple merge