From: Patrick McHardy <kaber@trash.net>
Date: Tue, 15 Jun 2010 15:31:06 +0000 (+0200)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v2.6.36-rc1~571^2~577^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9181f4ffc71d7b7dd1906c9a11d51d6659220ae;p=pandora-kernel.git

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	include/net/netfilter/xt_rateest.h
	net/bridge/br_netfilter.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

f9181f4ffc71d7b7dd1906c9a11d51d6659220ae
Reading git-diff-tree failed