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
..
claw.c	s390: Use ccw_device_get_id() in qeth/claw drivers	2007-06-20 19:12:42 -04:00
claw.h	Fix misc .c/.h comment typos	2006-11-30 05:24:39 +01:00
ctcdbug.c	[PATCH] s390: Remove CVS generated information	2006-02-01 08:53:23 -08:00
ctcdbug.h	[PATCH] s390: Remove CVS generated information	2006-02-01 08:53:23 -08:00
ctcmain.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2007-04-27 09:26:46 -07:00
ctcmain.h	[PATCH] s390: remove tty support from ctc network device driver [1/2]	2006-04-20 17:27:54 -04:00
cu3088.c	[S390] Get rid of a lot of sparse warnings.	2007-02-05 21:16:47 +01:00
cu3088.h	[PATCH] s390: claw driver wiring	2005-05-15 18:06:16 -04:00
fsm.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
fsm.h	[PATCH] s390: Remove CVS generated information	2006-02-01 08:53:23 -08:00
Kconfig	[S390] Kconfig: use common Kconfig files for s390.	2007-05-10 15:46:08 +02:00
lcs.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	2007-04-25 22:28:23 -07:00
lcs.h	[S390] non-unique constant/macro identifiers.	2006-12-04 15:40:59 +01:00
Makefile	[S390]: Rewrite of the IUCV base code, part 1	2007-02-08 13:36:44 -08:00
netiucv.c	s390: netiucv inlining cleanup	2007-06-20 19:12:42 -04:00
qeth_eddp.c	s390: qeth: wrong packet length in qdio header	2007-06-20 19:12:42 -04:00
qeth_eddp.h	s390: qeth driver connection hang	2007-05-08 01:15:35 -04:00
qeth_fs.h	[netdrvr s/390] trim trailing whitespace	2006-05-26 21:58:38 -04:00
qeth_main.c	s390: add barriers to qeth driver	2007-07-16 18:28:04 -04:00
qeth_mpc.c	[S390] Avoid sparse warnings.	2007-05-10 15:45:52 +02:00
qeth_mpc.h	s390: qeth driver hardware specs adaptions	2007-05-08 01:16:24 -04:00
qeth_proc.c	s390: scatter-gather for inbound traffic in qeth driver	2007-07-16 18:28:04 -04:00
qeth_sys.c	sysfs: kill unnecessary attribute->owner	2007-07-11 16:09:06 -07:00
qeth_tso.h	[SK_BUFF]: Introduce tcp_hdr(), remove skb->h.th	2007-04-25 22:25:26 -07:00
qeth.h	s390: scatter-gather for inbound traffic in qeth driver	2007-07-16 18:28:04 -04:00
smsgiucv.c	[S390]: Adapt special message interface to new IUCV API	2007-02-08 13:51:11 -08:00
smsgiucv.h	[PATCH] s390: cmm guest sender id	2005-05-01 08:58:58 -07:00