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

Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

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

2014-04-24 13:19:00 -04:00

..

i40e_adminq_cmd.h

i40e/i40evf: update AdminQ API

2014-04-22 03:10:50 -07:00

i40e_adminq.c

i40e/i40evf: add tracking to NVM busy state

2014-04-21 21:26:52 -07:00

i40e_adminq.h

i40e/i40evf: add tracking to NVM busy state

2014-04-21 21:26:52 -07:00

i40e_alloc.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_common.c

i40e: Enable VF Tx bandwidth setting

2014-04-21 20:54:06 -07:00

i40e_dcb_nl.c

i40e: add DCB and DCBNL support

2014-01-17 19:13:04 -08:00

i40e_dcb.c

i40e: Fix static checker warning

2014-03-06 18:41:50 -08:00

i40e_dcb.h

i40e: implement DCB support infastructure

2014-01-17 19:13:04 -08:00

i40e_debugfs.c

i40e: check for netdev before debugfs use

2014-03-28 06:54:00 -07:00

i40e_diag.c

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_diag.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_ethtool.c

i40e: Tweak for-loop in i40e_ethtool.c

2014-04-22 04:13:09 -07:00

i40e_hmc.c

i40e: use assignment instead of memcpy

2014-01-10 16:30:31 -08:00

i40e_hmc.h

i40e: Cleanup Doxygen warnings

2014-01-10 16:30:33 -08:00

i40e_lan_hmc.c

i40e/i40evf: unhide and enable to one prefena field

2014-04-21 20:35:42 -07:00

i40e_lan_hmc.h

i40e/i40evf: unhide and enable to one prefena field

2014-04-21 20:35:42 -07:00

i40e_main.c

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

2014-04-24 13:19:00 -04:00

i40e_nvm.c

e1000e/igb/ixgbe/i40e: fix message terminations

2014-04-18 18:41:24 -07:00

i40e_osdep.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_prototype.h

i40e: Enable VF Tx bandwidth setting

2014-04-21 20:54:06 -07:00

i40e_ptp.c

e1000e/igb/ixgbe/i40e: fix message terminations

2014-04-18 18:41:24 -07:00

i40e_register.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_status.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e_txrx.c

e1000e/igb/ixgbe/i40e: fix message terminations

2014-04-18 18:41:24 -07:00

i40e_txrx.h

i40e: enable PTP

2014-01-10 16:33:39 -08:00

i40e_type.h

i40e/i40evf: Add an FD message level

2014-03-28 06:54:00 -07:00

i40e_virtchnl_pf.c

i40e: report VF link state correctly

2014-04-23 01:54:00 -07:00

i40e_virtchnl_pf.h

i40e: Enable VF Tx bandwidth setting

2014-04-21 20:54:06 -07:00

i40e_virtchnl.h

i40e: Fix GPL header

2014-01-09 02:10:23 -08:00

i40e.h

i40e: eeprom integrity check on load and empr

2014-03-28 06:53:59 -07:00

Makefile

i40e: add DCB option to Kconfig

2014-01-17 19:13:04 -08:00