From: David S. Miller <davem@davemloft.net>
Date: Mon, 7 Jun 2010 00:42:02 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eedc765ca4b19a41cf0b921a492ac08d640060d1;p=linux-beck.git

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

Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c
---

eedc765ca4b19a41cf0b921a492ac08d640060d1