From: David S. Miller <davem@davemloft.net>
Date: Mon, 4 Oct 2010 18:56:38 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.37-rc1~147^2~261
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21a180cda012e1f93e362dd4a9b0bfd3d8c92940;p=pandora-kernel.git

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

Conflicts:
	net/ipv4/Kconfig
	net/ipv4/tcp_timer.c
---

21a180cda012e1f93e362dd4a9b0bfd3d8c92940
Reading git-diff-tree failed