From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Apr 2011 20:44:25 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.0-rc1~377^2~457
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c01a80cfec6f806246f31ff2680cd3639b30e67;p=pandora-kernel.git

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

Conflicts:
	drivers/net/smsc911x.c
---

1c01a80cfec6f806246f31ff2680cd3639b30e67
Reading git-diff-tree failed