Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 May 2012 21:13:55 +0000 (22:13 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 29 May 2012 21:13:55 +0000 (22:13 +0100)
commite94c805f0c234ef54609f23695b60add6b25ad40
tree09e116c62b065316eb93070e78a1843d9055373a
parentef0c14842e6e04b860d0309c5d5a3c1ead344e35
parent70b58d896b1b30e4b89d369fbeb244c0e952cf9f
Merge branch 'for-arm' of git://git./linux/kernel/git/viro/signal.git into for-linus

Conflicts:
arch/arm/kernel/ptrace.c
arch/arm/include/asm/thread_info.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/ptrace.c
arch/arm/kernel/signal.c
arch/arm/kernel/traps.c