linux/drivers/s390/net
David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-15 11:59:32 -04:00
..
ctcm_dbug.c
ctcm_dbug.h
ctcm_fsms.c s390/ctcm: improve endianness handling 2017-04-07 05:52:51 -07:00
ctcm_fsms.h
ctcm_main.c s390/ctcm: improve endianness handling 2017-04-07 05:52:51 -07:00
ctcm_main.h
ctcm_mpc.c treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
ctcm_mpc.h
ctcm_sysfs.c
fsm.c
fsm.h
Kconfig
lcs.c s390/lcs: remove trailing space at end of dev_err message 2016-10-13 10:59:45 -04:00
lcs.h
Makefile
netiucv.c net: s390: fix up for "Fix inconsistent teardown and release of private netdev state" 2017-06-08 10:13:28 -04:00
qeth_core_main.c s390/qeth: do early device setup for z/VM IQD NICs 2017-06-06 13:05:01 -04:00
qeth_core_mpc.c s390/qeth: add missing strings for IPA return codes 2017-06-06 13:05:00 -04:00
qeth_core_mpc.h s390/qeth: remove support for IPA_IP_FRAGMENTATION 2017-06-06 13:04:59 -04:00
qeth_core_sys.c s390/qeth: do early device setup for z/VM IQD NICs 2017-06-06 13:05:01 -04:00
qeth_core.h s390/qeth: do early device setup for z/VM IQD NICs 2017-06-06 13:05:01 -04:00
qeth_l2_main.c s390/qeth: log bridgeport capabilities 2017-06-06 13:05:00 -04:00
qeth_l2_sys.c s390/qeth: unbreak OSM and OSN support 2017-05-11 12:37:48 -04:00
qeth_l2.h s390/qeth: unbreak OSM and OSN support 2017-05-11 12:37:48 -04:00
qeth_l3_main.c s390/qeth: add support for early L3 device setup 2017-06-06 13:05:01 -04:00
qeth_l3_sys.c s390/qeth: add support for early L3 device setup 2017-06-06 13:05:01 -04:00
qeth_l3.h s390/qeth: add support for early L3 device setup 2017-06-06 13:05:01 -04:00
smsgiucv_app.c
smsgiucv.c s390/iucv: do not use arrays as argument 2015-09-21 16:03:04 -07:00
smsgiucv.h