David S. Miller e2160156bf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-02-02 16:54:00 -05:00

..

liquidio

liquidio: fix for iq and droq cnts going negative

2017-02-01 12:25:40 -05:00

octeon

drivers: net: generalize napi_complete_done()

2017-01-30 15:10:42 -05:00

thunder

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-02-02 16:54:00 -05:00

Kconfig

LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK

2017-01-04 13:27:16 -05:00

Makefile

netdev: Move octeon/octeon_mgmt driver to cavium directory.

2016-03-18 18:25:30 -04:00