summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-05-29 23:13:55 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-05-29 23:13:55 +0200
commite94c805f0c234ef54609f23695b60add6b25ad40 (patch)
tree09e116c62b065316eb93070e78a1843d9055373a /tools
parentARM: neponset: make sure neponset_ncr_frob() is exported (diff)
parentarm: don't open-code ptrace_report_syscall() (diff)
downloadlinux-e94c805f0c234ef54609f23695b60add6b25ad40.tar.xz
linux-e94c805f0c234ef54609f23695b60add6b25ad40.zip
Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus
Conflicts: arch/arm/kernel/ptrace.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions