From: David S. Miller <davem@davemloft.net>
Date: Fri, 19 Nov 2010 21:13:47 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.38-rc1~476^2~500
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24912420e923d56461b400d83f250a31bed8a964;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c
---

24912420e923d56461b400d83f250a31bed8a964
Reading git-diff-tree failed