git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bb862b
)
e1000e: Fix merge conflict (net->net-next)
author
Jeff Kirsher
<jeffrey.t.kirsher@intel.com>
Wed, 9 May 2012 09:15:14 +0000
(
02:15
-0700)
committer
Jeff Kirsher
<jeffrey.t.kirsher@intel.com>
Wed, 9 May 2012 09:15:14 +0000
(
02:15
-0700)
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>
No differences found
git.openpandora.org / pandora-kernel.git / commitdiff