diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-05-09 09:23:46 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-09 16:06:39 (GMT) |
| commit | 2e7d21c54adbab6d10481eddc685328f89bb6389 (patch) | |
| tree | f428119c05ac9daedd18921760131980bff6dee0 /Documentation/cgroups | |
| parent | 9bb862beb6e5839e92f709d33fda07678f062f20 (diff) | |
| download | linux-2e7d21c54adbab6d10481eddc685328f89bb6389.tar.xz | |
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/cgroups')
0 files changed, 0 insertions, 0 deletions