linux/drivers/s390/net
David S. Miller e40051d134 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/qlcnic/qlcnic_init.c
	net/ipv4/ip_output.c
2010-09-27 01:03:03 -07:00
..
claw.c claw: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:22 -07:00
claw.h claw: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:22 -07:00
ctcm_dbug.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ctcm_dbug.h s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_fsms.c ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
ctcm_fsms.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_main.c s390: use free_netdev(netdev) instead of kfree() 2010-09-26 18:56:06 -07:00
ctcm_main.h ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
ctcm_mpc.c ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
ctcm_mpc.h s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_sysfs.c ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
fsm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fsm.h ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
Kconfig Kconfig: have CCWGROUP depend on CLAW 2010-09-08 14:31:01 -07:00
lcs.c drivers/s390/net: Drop memory allocation cast 2010-05-17 22:42:54 -07:00
lcs.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
Makefile [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00
netiucv.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
qeth_core_main.c qeth: NAPI support for l2 and l3 discipline 2010-09-08 14:31:02 -07:00
qeth_core_mpc.c qeth: support z/VM VSWITCH Port Isolation 2009-05-20 17:36:50 -07:00
qeth_core_mpc.h qeth: handle missing z/VM authorization of OSX 2010-06-23 13:16:37 -07:00
qeth_core_sys.c qeth: serialize sysfs-triggered device configurations 2010-07-23 12:36:23 -07:00
qeth_core.h qeth: NAPI support for l2 and l3 discipline 2010-09-08 14:31:02 -07:00
qeth_l2_main.c qeth: NAPI support for l2 and l3 discipline 2010-09-08 14:31:02 -07:00
qeth_l3_main.c qeth: NAPI support for l2 and l3 discipline 2010-09-08 14:31:02 -07:00
qeth_l3_sys.c qeth: IP address takeover flag setting 2010-07-23 12:36:22 -07:00
qeth_l3.h qeth: IP address takeover flag setting 2010-07-23 12:36:22 -07:00
smsgiucv_app.c [S390] cmm, smsgiucv_app: convert sender to uppercase 2010-08-09 18:12:54 +02:00
smsgiucv.c smsgiucv: guarantee single iucv connect in thaw 2010-06-23 13:16:32 -07:00
smsgiucv.h [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00