From: Patrick McHardy <kaber@trash.net>
Date: Tue, 20 Apr 2010 14:02:01 +0000 (+0200)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v2.6.35-rc1~473^2~168^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62910554656cdcd6b6f84a5154c4155aae4ca231;p=pandora-kernel.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

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

62910554656cdcd6b6f84a5154c4155aae4ca231
Reading git-diff-tree failed