]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 27d9de1) | 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)
commit01490cb75d5a68b36f3a8d3626b9d1c5330069e0
treef428119c05ac9daedd18921760131980bff6dee0tree | snapshot
parent27d9de13d29d137c71d19dbd2c3f85c6a1a9de04commit | 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
Linux Kernel Source Tree.