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

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

Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)

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

Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
author David S. Miller <davem@davemloft.net>
Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
committer David S. Miller <davem@davemloft.net>
Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
diff --cc net/batman-adv/translation-table.c
Simple merge
diff --cc net/batman-adv/types.h
Simple merge
author	David S. Miller <davem@davemloft.net>
	Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
committer	David S. Miller <davem@davemloft.net>
	Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
		1	2
net/batman-adv/translation-table.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/batman-adv/types.h	patch \|	diff1 \|	diff2 \|	blob \| history