David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/isdn/i4l/isdn_net.c fs/cifs/connect.c		2008-11-18 23:38:23 -08:00
..
block	[S390] dasd: log sense for fatal errors	2008-11-14 18:18:54 +01:00
char	[S390] sclp: emit error message if assign storage fails	2008-11-14 18:18:52 +01:00
cio	[S390] cio: Fix refcount after moving devices.	2008-11-14 18:18:54 +01:00
crypto	Merge commit 'linus/master' into merge-linus	2008-10-17 09:20:26 -07:00
kvm	[S390] kvm_s390: Fix oops in virtio device detection with "mem="	2008-11-14 18:18:52 +01:00
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-10-31 00:17:34 -07:00
scsi	[SCSI] zfcp: Fix hexdump data in s390dbf traces	2008-11-05 12:47:55 -05:00
ebcdic.c
Makefile
s390_rdev.c	[S390] bus_id -> dev_set_name() changes	2008-10-10 21:33:50 +02:00
s390mach.c	[S390] stp support.	2008-07-14 10:02:09 +02:00
s390mach.h	[S390] stp support.	2008-07-14 10:02:09 +02:00
sysinfo.c