diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-05-17 14:11:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-17 14:11:19 -0400 |
| commit | 08a6ee5807711c4dfa0726e315864a408aa6c13c (patch) | |
| tree | 908cda03c0f0104845311cabe0fabd105755474f /tools/perf/scripts/python/syscall-counts.py | |
| parent | bpf: arm64: remove callee-save registers use for tmp registers (diff) | |
| parent | Merge tag 'qcom-soc-for-4.7-2' into net-next (diff) | |
| download | wireguard-linux-08a6ee5807711c4dfa0726e315864a408aa6c13c.tar.xz wireguard-linux-08a6ee5807711c4dfa0726e315864a408aa6c13c.zip | |
Merge tag 'net-next-qcom-soc-4.7-2-merge' of git://github.com/andersson/kernel
Merge tag 'qcom-soc-for-4.7-2' into net-next
This merges the Qualcomm SOC tree with the net-next, solving the
merge conflict in the SMD API between the two.
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions