aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorDavid S. Miller <[email protected]>2013-06-24 12:43:40 -0700
committerDavid S. Miller <[email protected]>2013-06-24 12:43:40 -0700
commitd3c5f47ee2d16497fafaf2f26b0ffeb5c3d4e721 (patch)
tree9e0c673cdc9817ccaf9b31f07116d6a586de25c5 /tools/perf/scripts/python
parent37173488400704f1a05656616cd12baa9e03173b (diff)
net: Restore unintentional reverts.
This restores commits: c573972c111eb4c6b3f3250ad71e7c75cc799833 1a5904342c7380ceddd61c0b37544d752d0b1433 da2e2c214953f37c2a6be20226537ca5a329724c which initially accidently went into 'net', were reverted there, and then properly placed into 'net-next'. But the next net --> net-next merge accidently wiped them out again. Reported-by: Paul Gortmaker <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions