kernel-fxtec-pro1x/drivers/s390
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08:00
..
block [S390] dasd: use idal for device characteristics 2009-10-14 12:43:53 +02:00
char [S390] sclp: undo quiesce handler override on resume 2009-11-13 15:45:03 +01:00
cio [S390] cio: change misleading console logic 2009-10-14 12:43:53 +02:00
crypto [S390] zcrypt: Improve some comments 2009-10-06 10:35:09 +02:00
kvm [S390] kvm: use console_initcall() to initialize s390 virtio console 2009-09-11 10:29:52 +02:00
net Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
scsi [SCSI] zfcp: Flush SCSI registration work when adding unit 2009-10-22 09:38:51 +09:00
Makefile [S390] split/move machine check handler code 2009-03-26 15:24:10 +01:00