git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9bb862b)
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)
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>

No differences found
Pandora Kernel Repository