David S. Miller 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

2009-06-15 03:02:23 -07:00

..

am79c961a.c

am79c961a: convert to net_device_ops

2009-04-11 02:53:53 -07:00

am79c961a.h

…

at91_ether.c

net: use symbolic values for ndo_start_xmit() return codes

2009-06-13 01:18:50 -07:00

at91_ether.h

…

ep93xx_eth.c

net: replace dma_sync_single with dma_sync_single_for_cpu

2009-05-29 01:51:22 -07:00

ether1.c

ether1: convert to net_device_ops

2009-04-11 02:53:55 -07:00

ether1.h

…

ether3.c

net: use symbolic values for ndo_start_xmit() return codes

2009-06-13 01:18:50 -07:00

ether3.h

…

etherh.c

…

ixp4xx_eth.c

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

2009-06-15 03:02:23 -07:00

Kconfig

…

ks8695net.c

…

ks8695net.h

…

Makefile

…