Jeff Kirsher eeb0d0132d e1000e: Fix merge conflict (net->net-next) ...

During merge of net to net-next the changes in patch:

e1000e: Fix default interrupt throttle rate not set in NIC HW

got munged in param.c of the e1000e driver.  This rectifies the
merge issues.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

2012-05-09 02:15:14 -07:00

..

80003es2lan.c

e1000e: Driver workaround for IPv6 Header Extension Erratum.

2012-05-03 02:29:04 -07:00

82571.c

e1000e: clear REQ and GNT in EECD (82571 && 82572)

2012-05-05 05:05:22 -07:00

defines.h

e1000e: initial support for i217

2012-05-04 03:15:06 -07:00

e1000.h

e1000e: initial support for i217

2012-05-04 03:15:06 -07:00

ethtool.c

e1000e: initial support for i217

2012-05-04 03:15:06 -07:00

hw.h

e1000e: initial support for i217

2012-05-04 03:15:06 -07:00

ich8lan.c

e1000e: initial support for i217

2012-05-04 03:15:06 -07:00

mac.c

e1000e: fix .ndo_set_rx_mode for 82579

2012-05-02 01:58:53 -07:00

Makefile

e1000e: update copyright year

2012-01-26 19:01:17 -08:00

manage.c

e1000e: cleanup boolean logic

2012-04-14 02:05:00 -07:00

netdev.c

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

2012-05-07 23:35:40 -04:00

nvm.c

e1000e: rename e1000e_reload_nvm() and call as function pointer

2012-02-24 21:43:21 -08:00

param.c

e1000e: Fix merge conflict (net->net-next)

2012-05-09 02:15:14 -07:00

phy.c

e1000e: enable forced master/slave on 82577

2012-05-05 05:01:51 -07:00