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)
Conflicts:
arch/arm/kernel/ptrace.c


Trivial merge