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
..
block	[S390] dasd: Avoid compile warnings on !CONFIG_DASD_PROFILE	2007-07-10 11:24:50 +02:00
char	[S390] vmlogrdr function annotation.	2007-07-10 11:24:54 +02:00
cio	sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes	2007-07-11 16:09:09 -07:00
crypto	[S390] zcrypt: fix request timeout handling	2007-07-10 11:24:52 +02:00
net	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2007-07-16 17:48:54 -07:00
scsi	[SCSI] zfcp: Report FCP LUN to SCSI midlayer	2007-06-19 19:51:02 -07:00
Makefile	[S390] Calibrate delay and bogomips.	2007-02-05 21:18:31 +01:00
ebcdic.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
s390_rdev.c	[PATCH] s390: kzalloc() conversion in drivers/s390	2006-03-24 07:33:18 -08:00
s390mach.c	[S390] cio: replace subchannel evaluation queue with bitmap	2007-04-27 16:01:40 +02:00
s390mach.h	[S390] ETR support.	2007-02-05 21:18:19 +01:00
sysinfo.c	[S390] Processor degradation notification.	2007-04-27 16:01:46 +02:00