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

…

ctcm_fsms.h

…

ctcm_main.c

…

ctcm_main.h

…

ctcm_mpc.c

…

ctcm_mpc.h

…

ctcm_sysfs.c

…

fsm.c

…

fsm.h

…

Kconfig

…

lcs.c

…

lcs.h

…

Makefile

…

netiucv.c

…

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_core_mpc.h

…

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_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

…

smsgiucv.h

…