From: David S. Miller <davem@davemloft.net>
Date: Sun, 20 Feb 2011 03:17:35 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.39-rc1~468^2~324
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da935c66bacb3ed9ada984b053297f87c2dff63a;p=pandora-kernel.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/e1000e/netdev.c
	net/xfrm/xfrm_policy.c
---

da935c66bacb3ed9ada984b053297f87c2dff63a
Reading git-diff-tree failed