Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Feb 2011 05:20:27 +0000 (21:20 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Feb 2011 05:20:27 +0000 (21:20 -0800)
1  2 
net/batman-adv/unicast.c

Simple merge