From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Nov 2008 10:19:15 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
X-Git-Tag: v2.6.29-rc1~581^2~367
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed77a89c30fa03dcb234a84ddea710b3fb7b62da;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6

Conflicts:

	net/netfilter/nf_conntrack_netlink.c
---

ed77a89c30fa03dcb234a84ddea710b3fb7b62da
Reading git-diff-tree failed