From: Patrick McHardy <kaber@trash.net>
Date: Mon, 10 May 2010 16:39:28 +0000 (+0200)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v2.6.35-rc1~473^2~168^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4b1057121bc756b91758a434b504d2010f6088;p=pandora-kernel.git

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

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

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

1e4b1057121bc756b91758a434b504d2010f6088
Reading git-diff-tree failed