David S. Miller a1744d3bee Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/p54/p54common.c		2008-10-31 00:17:34 -07:00
..
block	[PATCH] sanitize blkdev_get() and friends	2008-10-21 07:49:06 -04:00
char	[S390] tape: disable interrupts in tape_open and tape_release	2008-10-28 11:12:05 +01:00
cio	[S390] qdio: remove incorrect memset	2008-10-28 11:12:03 +01:00
crypto	Merge commit 'linus/master' into merge-linus	2008-10-17 09:20:26 -07:00
kvm	[S390] Use s390_root_dev_* in kvm_virtio.	2008-10-10 21:33:51 +02: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	blktrace: pass zfcp driver data	2008-10-17 08:46:57 +02:00
ebcdic.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	s390: KVM guest: virtio device support, and kvm hypercalls	2008-04-27 12:00:51 +03: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