From: David S. Miller <davem@davemloft.net>
Date: Fri, 7 Oct 2011 17:38:43 +0000 (-0400)
Subject: Merge branch 'master' of github.com:davem330/net
X-Git-Tag: v3.2-rc1~129^2~121
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9;p=pandora-kernel.git

Merge branch 'master' of github.com:davem330/net

Conflicts:
	net/batman-adv/soft-interface.c
---

88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9
Reading git-diff-tree failed