Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

author David S. Miller <davem@davemloft.net>

Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)

committer David S. Miller <davem@davemloft.net>

Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
author David S. Miller <davem@davemloft.net>
Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
committer David S. Miller <davem@davemloft.net>
Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
diff --cc Documentation/networking/batman-adv.txt
Simple merge
diff --cc net/batman-adv/soft-interface.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
committer	David S. Miller <davem@davemloft.net>
	Sun, 8 May 2011 22:39:11 +0000 (15:39 -0700)
		1	2
Documentation/networking/batman-adv.txt	patch \|	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	patch \|	diff1 \|	diff2 \|	blob \| history