diff options
author | 2010-10-21 11:21:55 -0700 | |
---|---|---|
committer | 2010-10-21 11:21:55 -0700 | |
commit | 7940a34b2e1e0485211a17d8c3ab4da1ea3e1330 (patch) | |
tree | fe08ba701cbf23ae44a16d3b7afa521fce943a8a /tools/perf/scripts/python/syscall-counts.py | |
parent | arm: remove machine_desc.io_pg_offst and .phys_io (diff) | |
parent | davinci: mityomapl138: make file local data static (diff) | |
download | wireguard-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.tar.xz wireguard-linux-7940a34b2e1e0485211a17d8c3ab4da1ea3e1330.zip |
Merge branch 'davinci-next' into davinci-for-linus
Conflicts:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions