Linus Torvalds 1f1c2881f6 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits) forcedeth bug fix: realtek phy forcedeth bug fix: vitesse phy forcedeth bug fix: cicada phy atl1: reorder atl1_main functions atl1: fix excessively indented code atl1: cleanup atl1_main atl1: header file cleanup atl1: remove irq_sem cdc-subset to support new vendor/product ID 8139cp: implement the missing dev->tx_timeout myri10ge: Remove nonsensical limit in the tx done routine gianfar: kill unused header EP93XX_ETH must select MII macb: Add multicast capability macb: Use generic PHY layer s390: add barriers to qeth driver s390: scatter-gather for inbound traffic in qeth driver eHEA: Introducing support vor DLPAR memory add Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c [PATCH] softmac: Fix ESSID problem ...		2007-07-16 17:48:54 -07:00
..
am79c961a.c	potential compiler error, irqfunc caller sites update	2007-07-06 10:23:43 -07:00
am79c961a.h	fix file specification in comments	2006-10-03 23:01:26 +02:00
at91_ether.c	AT91RM9200 Ethernet: Fix multicast addressing	2007-05-08 01:30:21 -04:00
at91_ether.h	AT91RM9200 Ethernet: Support additional PHYs	2007-05-08 01:30:21 -04:00
ep93xx_eth.c	[NET]: Kill eth_copy_and_sum().	2007-07-10 22:08:12 -07:00
ether1.c	[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()	2007-05-11 17:19:02 +01:00
ether1.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ether3.c	[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()	2007-05-11 17:19:02 +01:00
ether3.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
etherh.c	[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()	2007-05-11 17:19:02 +01:00
Kconfig	EP93XX_ETH must select MII	2007-07-16 18:28:04 -04:00
Makefile	[PATCH] Cirrus Logic ep93xx ethernet driver	2006-09-22 20:13:23 -04:00