Jeff Kirsher 2e7d21c54a 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>
Signed-off-by: David S. Miller <davem@davemloft.net>

2012-05-09 12:06:39 -04:00

..

e1000

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

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

e1000e

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

2012-05-09 12:06:39 -04:00

igb

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

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

igbvf

igbvf: fix the bug when initializing the igbvf

2012-04-30 18:54:31 -07:00

ixgb

intel: make wired ethernet driver message level consistent (rev2)

2012-03-27 23:29:22 -07:00

ixgbe

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

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

ixgbevf

ixgbevf: Update version string

2012-05-03 02:38:38 -07:00

e100.c

e100: enable transmit time stamping.

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

Kconfig

ixgbe: add hwmon interface to export thermal data

2012-05-02 02:12:23 -07:00

Makefile

…