diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-29 23:13:55 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-29 23:13:55 +0200 |
commit | e94c805f0c234ef54609f23695b60add6b25ad40 (patch) | |
tree | 09e116c62b065316eb93070e78a1843d9055373a /tools | |
parent | ARM: neponset: make sure neponset_ncr_frob() is exported (diff) | |
parent | arm: don't open-code ptrace_report_syscall() (diff) | |
download | linux-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