linux/drivers/s390/net
David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c
2011-06-20 22:29:08 -07:00
..
claw.c claw: remove unused return code handling 2011-05-13 14:55:20 -04: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
ctcm_fsms.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ctcm_fsms.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_main.c ctcm: get rid of compile warning 2011-05-13 14:55:20 -04:00
ctcm_main.h ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
ctcm_mpc.c ctcm: get rid of compile warning 2011-05-13 14:55:20 -04:00
ctcm_mpc.h net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07: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 [S390] cleanup s390 Kconfig 2011-01-05 12:47:23 +01:00
lcs.c lcs: get rid of compile warning 2011-05-13 14:55:20 -04: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 net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
qeth_core_main.c [S390] qdio: Split SBAL entry flags 2011-06-06 14:14:56 +02:00
qeth_core_mpc.c
qeth_core_mpc.h qeth: add OSA concurrent hardware trap 2011-05-13 14:55:20 -04:00
qeth_core_sys.c qeth: add OSA concurrent hardware trap 2011-05-13 14:55:20 -04:00
qeth_core.h [S390] qdio: Split SBAL entry flags 2011-06-06 14:14:56 +02:00
qeth_l2_main.c qeth: add OSA concurrent hardware trap 2011-05-13 14:55:20 -04:00
qeth_l3_main.c qeth: use ndo_set_features callback for initial setup and recovery 2011-05-18 17:27:39 -04:00
qeth_l3_sys.c qeth: convert to hw_features part 2 2011-05-13 14:55:20 -04:00
qeth_l3.h qeth: convert to hw_features part 2 2011-05-13 14:55:20 -04:00
smsgiucv_app.c [S390] cmm, smsgiucv_app: convert sender to uppercase 2010-08-09 18:12:54 +02:00
smsgiucv.c s390: Fix possibly wrong size in strncmp (smsgiucv) 2011-02-02 15:00:02 -08:00
smsgiucv.h [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00