leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d4673339ce
linux/drivers/s390/net
History
David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -07:00
..
ctcm_dbug.c
ctcm_dbug.h
ctcm_fsms.c s390/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05:00
ctcm_fsms.h
ctcm_main.c treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
ctcm_main.h s390/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05:00
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 s390/ctcm, netiucv: migrate variables to handle y2038 problem 2015-01-17 23:54:59 -05:00
fsm.c
fsm.h
Kconfig s390: remove claw driver 2015-02-28 23:38:29 -05:00
lcs.c s390: Use pr_warn instead of pr_warning 2016-03-07 13:12:04 +01:00
lcs.h
Makefile s390: remove claw driver 2015-02-28 23:38:29 -05:00
netiucv.c treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
qeth_core_main.c qeth: omit outbound queue 3 for unicast packets in Priority Queuing on HiperSockets 2016-06-16 22:16:13 -07:00
qeth_core_mpc.c qeth: OSA version of SETBRIDGEPORT command 2015-05-18 12:14:17 -04:00
qeth_core_mpc.h qeth: OSA version of SETBRIDGEPORT command 2015-05-18 12:14:17 -04:00
qeth_core_sys.c qeth: omit outbound queue 3 for unicast packets in Priority Queuing on HiperSockets 2016-06-16 22:16:13 -07:00
qeth_core.h qeth layer 2 and layer 3 common feature handling 2016-06-16 22:16:12 -07:00
qeth_l2_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-07-06 10:35:22 -07:00
qeth_l2_sys.c qeth: no write permission for readonly sysattr 2015-09-21 16:03:04 -07:00
qeth_l2.h qeth: optimize IP handling in rx_mode callback 2016-06-16 22:16:12 -07:00
qeth_l3_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-07-06 10:35:22 -07:00
qeth_l3_sys.c qeth: optimize IP handling in rx_mode callback 2016-06-16 22:16:12 -07:00
qeth_l3.h qeth: optimize IP handling in rx_mode callback 2016-06-16 22:16:12 -07:00
smsgiucv_app.c
smsgiucv.c s390/iucv: do not use arrays as argument 2015-09-21 16:03:04 -07:00
smsgiucv.h