David S. Miller 76fef2b6bf Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... Conflicts: drivers/s390/net/qeth_main.c		2008-03-22 18:22:42 -07:00
..
block	[S390] dasd: fix reference counting in display method for proc/dasd/devices	2008-03-05 12:37:18 +01:00
char	[S390] sclp_vt220: speed up console output for interactive work	2008-03-05 12:37:18 +01:00
cio	[S390] qdio: FCP/SCSI write I/O stagnates on LPAR	2008-02-19 15:29:35 +01:00
crypto	[S390] zcrypt: fix ap_device_list handling	2008-03-05 12:37:19 +01:00
net	Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2008-03-22 18:22:42 -07:00
scsi	[SCSI] zfcp: fix sense_buffer access bug	2008-01-30 13:03:39 -06:00
ebcdic.c
Makefile
s390_rdev.c
s390mach.c
s390mach.h
sysinfo.c	calibrate_delay() must be __cpuinit	2008-02-06 10:41:08 -08:00