commit | 2e7d21c54adbab6d10481eddc685328f89bb6389 | [log] [tgz] |
---|---|---|
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | Wed May 09 02:23:46 2012 -0700 |
committer | David S. Miller <davem@davemloft.net> | Wed May 09 12:06:39 2012 -0400 |
tree | f428119c05ac9daedd18921760131980bff6dee0 | |
parent | 9bb862beb6e5839e92f709d33fda07678f062f20 [diff] |
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>