tree 9d2690917533bbb4498c8c9df838de2d38360912
parent 000ba2e43f33901859fd794bb33c885909d53b3b
parent 887e671f324d9898aaedb29a6ece6c853c394067
author David S. Miller <davem@davemloft.net> 1257497755 -0800
committer David S. Miller <davem@davemloft.net> 1257497755 -0800

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>