kernel-fxtec-pro1x/drivers/s390
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
Makefile
s390_rdev.c [S390] bus_id -> dev_set_name() changes 2008-10-10 21:33:50 +02:00
s390mach.c
s390mach.h
sysinfo.c