]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.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:15:14 +0000 (02:15 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 9 May 2012 09:15:14 +0000 (02:15 -0700)
commiteeb0d0132d7a5f0ca149d1c6d6aeeafa19a98594
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>
drivers/net/ethernet/intel/e1000e/param.c diff | blob | history
Beck SC1x5 Kernel