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)
commitb8cec4a415e807a2f8679efa89558a040a7003de
tree1a5fc7c31c4f8b55ea850599bb7309871165f48e
parent5e2b61f78411be25f0b84f97d5b5d312f184dfd1
parente44d8fe2b5c27ecc230f886d4cc49fcbd86f87a0
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
net/batman-adv/unicast.c
net/batman-adv/vis.c