From: David S. Miller <davem@davemloft.net>
Date: Wed, 11 May 2011 18:26:15 +0000 (-0400)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6
X-Git-Tag: v3.0-rc1~377^2~110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c709f8fb43e07a0403bba4a8ca7ba00ab874994;p=pandora-kernel.git

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

Conflicts:
	drivers/net/benet/be_main.c
---

3c709f8fb43e07a0403bba4a8ca7ba00ab874994
Reading git-diff-tree failed