From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Jul 2008 03:23:54 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aec609fb45e84d65bc8eabc7b650bbecb1cc179;p=pandora-kernel.git

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

Conflicts:

	net/netfilter/nf_conntrack_proto_tcp.c
---

2aec609fb45e84d65bc8eabc7b650bbecb1cc179
Reading git-diff-tree failed