David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c		2008-12-02 19:50:27 -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	drivers/s390/ - csum_partial - remove unnecessary casts	2008-11-19 15:45:15 -08:00
scsi	[SCSI] zfcp: prevent double decrement on host_busy while being busy	2008-12-01 10:18:20 -06:00
Makefile	s390: KVM guest: virtio device support, and kvm hypercalls	2008-04-27 12:00:51 +03:00
ebcdic.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
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	[S390] Add new fields for System z10 to /proc/sysinfo	2008-04-17 07:47:01 +02:00