leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4b87f92259
linux/drivers/s390/net
History
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-15 15:05:59 -05:00
..
claw.c s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
claw.h claw: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:22 -07:00
ctcm_dbug.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ctcm_dbug.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ctcm_fsms.c drivers/s390/net: removes unnecessary semicolon 2012-09-24 15:45:17 -04:00
ctcm_fsms.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ctcm_main.c s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01:00
ctcm_main.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ctcm_mpc.c ctcm: remove BUG_ONs 2012-11-19 14:19:00 -05:00
ctcm_mpc.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ctcm_sysfs.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02: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 atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
Kconfig s390: delete any traces of token ring support 2012-05-15 20:08:21 -04:00
lcs.c s390/irq: remove split irq fields from /proc/stat 2013-01-08 10:57:07 +01: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 netiucv: cleanup attribute usage 2012-07-25 15:24:13 -07:00
qeth_core_main.c ethtool: fix drvinfo strings set in drivers 2013-01-06 21:06:31 -08:00
qeth_core_mpc.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
qeth_core_mpc.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
qeth_core_sys.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
qeth_core.h qeth: Consolidate tracing of card features 2012-11-19 14:19:00 -05:00
qeth_l2_main.c qeth: Remove BUG_ONs 2012-11-19 14:19:00 -05:00
qeth_l3_main.c qeth: ensure that __vlan_find_dev_deep() is called with rcu_read_lock 2013-01-04 13:31:50 -08:00
qeth_l3_sys.c s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
qeth_l3.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
smsgiucv_app.c Driver core: driver_find() drops reference before returning 2012-01-24 16:00:34 -08:00
smsgiucv.c smsgiucv: reestablish IUCV path after resume 2012-10-16 14:41:46 -04:00
smsgiucv.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00