linux/drivers/s390
David S. Miller d4a66e752d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h
2010-01-10 22:55:03 -08:00
..
block [S390] dasd: PTR_ERR return of wrong pointer in 2009-12-18 17:43:31 +01:00
char [S390] Use strim instead of strstrip to avoid false warnings. 2009-12-18 17:43:33 +01:00
cio [S390] qdio: add counter for input queue full condition 2009-12-18 17:43:32 +01:00
crypto [S390] zcrypt: remove BKL 2009-12-07 12:51:39 +01:00
kvm
net Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-01-10 22:55:03 -08:00
scsi
Makefile