From: David S. Miller <davem@davemloft.net>
Date: Wed, 3 Dec 2008 03:50:27 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~344
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aa2ba5f1082dc705745899584aac8416d710c056;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c
---

aa2ba5f1082dc705745899584aac8416d710c056