From: David S. Miller <davem@davemloft.net>
Date: Fri, 6 Nov 2009 08:55:55 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc2a85dec30097afd7b86c08d56424bbd120d655;hp=fc2a85dec30097afd7b86c08d56424bbd120d655;p=linux-firmware

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

Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---