From: David S. Miller <davem@davemloft.net>
Date: Mon, 25 Jun 2012 23:15:58 +0000 (-0700)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.6-rc1~125^2~448
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d5873e9d75bb72012a6c1327a368d0d2b13581f;p=pandora-kernel.git

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- yet another batch of 'namespace cleaning' patches

Conflicts:
	net/batman-adv/translation-table.c

Signed-off-by: David S. Miller <davem@davemloft.net>
---

1d5873e9d75bb72012a6c1327a368d0d2b13581f
Reading git-diff-tree failed