OpenCloudOS-Kernel/drivers/net/arm
David S. Miller 278554bd65 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/scsi/iscsi_tcp.c
	net/ipv4/ipmr.c
2010-05-12 00:05:35 -07:00
..
Kconfig ARM: 5865/1: nuc900 ethernet driver needs mii 2010-01-05 20:53:07 +00:00
Makefile Add mac driver for w90p910 2009-07-20 07:45:05 -07:00
am79c961a.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
am79c961a.h fix file specification in comments 2006-10-03 23:01:26 +02:00
at91_ether.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
at91_ether.h at91_ether: use netstats in net_device structure 2008-07-22 19:45:41 -04:00
ep93xx_eth.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-05-12 00:05:35 -07:00
ether1.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
ether1.h
ether3.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
ether3.h
etherh.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixp4xx_eth.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
ks8695net.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
ks8695net.h net: Add support for the KS8695 ethernet devices. 2008-12-11 21:00:29 -08:00
w90p910_ether.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00