From: David S. Miller <davem@davemloft.net>
Date: Tue, 3 Aug 2010 05:22:46 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.36-rc1~571^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00dad5e479531e379aba7358600cc768725d4f1f;p=pandora-kernel.git

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

Conflicts:
	drivers/net/e1000e/hw.h
	net/bridge/br_device.c
	net/bridge/br_input.c
---

00dad5e479531e379aba7358600cc768725d4f1f
Reading git-diff-tree failed