From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 29 May 2012 21:13:55 +0000 (+0100)
Subject: Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal... 
X-Git-Tag: v3.5-rc1~48^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94c805f0c234ef54609f23695b60add6b25ad40;p=pandora-kernel.git

Merge branch 'for-arm' of git://git./linux/kernel/git/viro/signal.git into for-linus

Conflicts:
	arch/arm/kernel/ptrace.c
---

e94c805f0c234ef54609f23695b60add6b25ad40
Reading git-diff-tree failed