diff options
| author | Jeff Kirsher <[email protected]> | 2012-05-09 02:23:46 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2012-05-09 12:06:39 -0400 |
| commit | 2e7d21c54adbab6d10481eddc685328f89bb6389 (patch) | |
| tree | f428119c05ac9daedd18921760131980bff6dee0 /tools/perf/scripts/python/bin/stackcollapse-report | |
| parent | 9bb862beb6e5839e92f709d33fda07678f062f20 (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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/bin/stackcollapse-report')
0 files changed, 0 insertions, 0 deletions