projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9bb862b) | patch
e1000e: Fix merge conflict (net->net-next)
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 9 May 2012 09:23:46 +0000 (02:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 May 2012 16:06:39 +0000 (12:06 -0400)
commit2e7d21c54adbab6d10481eddc685328f89bb6389
treef428119c05ac9daedd18921760131980bff6dee0tree | snapshot
parent9bb862beb6e5839e92f709d33fda07678f062f20commit | 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>
drivers/net/ethernet/intel/e1000e/param.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.