diff options
| author | David S. Miller <[email protected]> | 2019-04-05 14:14:19 -0700 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-04-05 14:14:19 -0700 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | 8f4043f1253292495dbf9c8be0c1b07b4b9902b7 (diff) | |
| parent | 7f46774c6480174eb869a3c15167eafac467a6af (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions