OpenCloudOS-Kernel/drivers/s390
David S. Miller b262e60309 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c
2008-10-01 06:12:56 -07:00
..
block [S390] dcss: fix build bug. 2008-08-25 18:15:01 +02:00
char [S390] drivers/s390: Use an IS_ERR test rather than a NULL test 2008-08-21 19:46:39 +02:00
cio [S390] cio: fix orb initialization in cio_start_key 2008-09-16 09:34:32 -07:00
crypto Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 2008-07-14 14:48:31 -07:00
kvm [S390] virtio console: fix section mismatch warning. 2008-08-01 16:39:35 +02:00
net qeth: avoid qeth recovery problems 2008-09-24 20:47:57 -04:00
scsi [SCSI] zfcp: Remove duplicated unlikely() macros. 2008-08-29 09:05:05 -05: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 [PATCH] s390: kzalloc() conversion in drivers/s390 2006-03-24 07:33:18 -08: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