1
linux/drivers/s390/net
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
..
claw.c net/s390 drivers: add missing 'const' attribute 2009-11-17 06:47:02 -08:00
claw.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_dbug.c
ctcm_dbug.h
ctcm_fsms.c s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_fsms.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_main.c net/s390 drivers: add missing 'const' attribute 2009-11-17 06:47:02 -08:00
ctcm_main.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_mpc.c s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_mpc.h
ctcm_sysfs.c s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
fsm.c ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
fsm.h ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
Kconfig trivial: Kconfig: .ko is normally not included in module names 2009-06-12 18:01:50 +02:00
lcs.c net/s390 drivers: add missing 'const' attribute 2009-11-17 06:47:02 -08:00
lcs.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
Makefile s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
netiucv.c netiucv: displayed TX bytes value much too high 2009-11-13 20:47:01 -08:00
qeth_core_main.c qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_core_mpc.c
qeth_core_mpc.h qeth: Exploit Connection Isolation 2009-11-16 02:42:05 -08:00
qeth_core_sys.c qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_core.h qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_l2_main.c qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_l3_main.c qeth: allow dynamic change of rx checksumming 2009-11-16 02:42:09 -08:00
qeth_l3_sys.c qeth: allow dynamic change of rx checksumming 2009-11-16 02:42:09 -08:00
qeth_l3.h qeth: allow dynamic change of rx checksumming 2009-11-16 02:42:09 -08:00
smsgiucv.c [S390] s/r: cmm resume fix 2009-10-29 15:05:12 +01:00
smsgiucv.h