OpenCloudOS-Kernel/drivers/s390/net
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
Kconfig qeth: s390 ethernet device driver dependency 2014-10-26 22:21:39 -04:00
Makefile qeth: bridgeport support - basic control 2014-01-15 14:48:01 -08:00
claw.c s390/net: Delete useless checks before function calls 2015-01-17 23:54:59 -05:00
claw.h s390/s390dbf: use debug_level_enabled() where applicable 2013-10-24 17:16:54 +02:00
ctcm_dbug.c s390/s390dbf: use debug_level_enabled() where applicable 2013-10-24 17:16:54 +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 s390/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05: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/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05:00
ctcm_main.h s390/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05: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/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05: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
lcs.c s390/net: Delete useless checks before function calls 2015-01-17 23:54:59 -05:00
lcs.h s390/s390dbf: use debug_level_enabled() where applicable 2013-10-24 17:16:54 +02:00
netiucv.c s390/net: Delete useless checks before function calls 2015-01-17 23:54:59 -05:00
qeth_core.h qeth: Remove unneeded structure member 2015-01-17 23:55:00 -05:00
qeth_core_main.c 390/qeth: Fix locking warning during qeth device setup 2015-01-25 23:38:16 -08:00
qeth_core_mpc.c qeth: bridgeport support - address notifications 2014-01-15 14:48:01 -08:00
qeth_core_mpc.h qeth: Display adjacent switch attributes 2014-07-21 20:21:40 -07:00
qeth_core_sys.c qeth: sysfs: replace strcmp() with sysfs_streq() 2015-01-17 23:55:00 -05:00
qeth_l2.h qeth: bridgeport support - basic control 2014-01-15 14:48:01 -08:00
qeth_l2_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
qeth_l2_sys.c qeth: don't query for info if hardware not ready. 2014-09-02 13:54:06 -07:00
qeth_l3.h qeth: make local functions static in qeth_l3 module 2014-10-26 22:21:39 -04:00
qeth_l3_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
qeth_l3_sys.c qeth: sysfs: replace strcmp() with sysfs_streq() 2015-01-17 23:55:00 -05: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
smsgiucv_app.c Driver core: driver_find() drops reference before returning 2012-01-24 16:00:34 -08:00