diff options
| author |   Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 18:04:15 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-08-28 18:04:15 +0200 |
| commit | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (patch) | |
| tree | 411b1d357731db5e2611f0ca67082a8c909b7d9d /tools/perf/scripts/python/call-graph-from-sql.py | |
| parent | mtd: make device_type const (diff) | |
| parent | Linux 4.13-rc7 (diff) | |
| download | wireguard-linux-5ffa70b2a38befadb920b85fe87f5da2b4cff623.tar.xz wireguard-linux-5ffa70b2a38befadb920b85fe87f5da2b4cff623.zip | |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-sql.py')
0 files changed, 0 insertions, 0 deletions