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

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h

2010-01-10 22:55:03 -08:00

..

asix.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

catc.c

drivers/net/usb/catc.c: use %pM to shown MAC address

2009-12-29 20:06:45 -08:00

cdc_eem.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

cdc_ether.c

usbnet & cdc-ether: Autosuspend for online devices

2009-12-03 15:31:18 -08:00

cdc_subset.c

…

cdc-phonet.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

dm9601.c

usbnet: Set link down initially for drivers that update link state

2009-11-10 20:54:40 -08:00

gl620a.c

…

hso.c

hso: fixed missing newlines

2010-01-07 00:43:47 -08:00

int51x1.c

…

kaweth.c

usb: remove rare pm primitive for conversion to new API

2009-12-11 21:43:00 -08:00

Kconfig

cdc_ether: additional Ericsson MBM PID's to the whitelist

2009-11-04 05:25:02 -08:00

Makefile

…

mcs7830.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

net1080.c

…

pegasus.c

…

pegasus.h

…

plusb.c

…

rndis_host.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00

rtl8150.c

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

2010-01-10 22:55:03 -08:00

smsc95xx.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

smsc95xx.h

…

usbnet.c

usbnet & cdc-ether: Autosuspend for online devices

2009-12-03 15:31:18 -08:00

zaurus.c

drivers/net: Move && and || to end of previous line

2009-12-03 13:18:01 -08:00