diff options
| author | David S. Miller | 2018-09-25 19:35:29 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-09-25 19:35:29 +0200 |
| commit | a06ee256e5d6f03fffbd088de9bf84035658cc5a (patch) | |
| tree | 9b88044cd4a46496d15a05b43246810c8b677f46 /tools/perf/builtin-script.c | |
| parent | net: macb: Clean 64b dma addresses if they are not detected (diff) | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| download | kernel-qcow2-linux-a06ee256e5d6f03fffbd088de9bf84035658cc5a.tar.gz kernel-qcow2-linux-a06ee256e5d6f03fffbd088de9bf84035658cc5a.tar.xz kernel-qcow2-linux-a06ee256e5d6f03fffbd088de9bf84035658cc5a.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Version bump conflict in batman-adv, take what's in net-next.
iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/builtin-script.c')
0 files changed, 0 insertions, 0 deletions