]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3999e84ed2a0dca1fd6339ccdc60d2e28d3f803b
tree09e116c62b065316eb93070e78a1843d9055373a
parentd42b51de45d47ade08387bc2f25b8cb0d3942685
parentaeb43a8550de48ccb4db18c79c67728a3ce1b8b4
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
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