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

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-14 07:56:40 -07:00

..

asix.c

…

catc.c

…

cdc_eem.c

…

cdc_ether.c

…

cdc_ncm.c

net: Remove unneeded version.h includes from drivers/net/

2011-06-24 02:40:08 -07:00

cdc_subset.c

…

cdc-phonet.c

…

cx82310_eth.c

…

dm9601.c

…

gl620a.c

…

hso.c

hso: fix a use after free condition

2011-07-08 09:07:59 -07:00

int51x1.c

…

ipheth.c

…

kalmia.c

drivers/net: static should be at beginning of declaration

2011-07-11 22:15:02 -07:00

kaweth.c

…

Kconfig

…

lg-vl600.c

…

Makefile

…

mcs7830.c

…

net1080.c

…

pegasus.c

…

pegasus.h

…

plusb.c

…

rndis_host.c

…

rtl8150.c

…

sierra_net.c

…

smsc75xx.c

…

smsc75xx.h

…

smsc95xx.c

…

smsc95xx.h

…

usbnet.c

…

zaurus.c

usbnet: Remove over-broad module alias from zaurus.

2011-06-29 06:09:17 -07:00