Linus Torvalds fb21affa49 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal ... Pull second pile of signal handling patches from Al Viro: "This one is just task_work_add() series + remaining prereqs for it. There probably will be another pull request from that tree this cycle - at least for helpers, to get them out of the way for per-arch fixes remaining in the tree." Fix trivial conflict in kernel/irq/manage.c: the merge of Andrew's pile had brought in commit 97fd75b7b8 ("kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks") which changed one of the pr_err() calls that this merge moves around. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: keys: kill task_struct->replacement_session_keyring keys: kill the dummy key_replace_session_keyring() keys: change keyctl_session_to_parent() to use task_work_add() genirq: reimplement exit_irq_thread() hook via task_work_add() task_work_add: generic process-context callbacks avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers parisc: need to check NOTIFY_RESUME when exiting from syscall move key_repace_session_keyring() into tracehook_notify_resume() TIF_NOTIFY_RESUME is defined on all targets now		2012-05-31 18:47:30 -07:00
..
drivers	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-05-23 09:01:41 -07:00
include	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-05-31 18:47:30 -07:00
os-Linux	um: Remove unused variables	2012-05-21 21:09:32 +02:00
scripts	um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS	2012-03-25 00:29:56 +01:00
sys-ia64	uml: remove useless comments	2009-04-01 08:59:17 -07:00
sys-ppc	um: change to new flag variables	2011-03-17 14:02:57 +01:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig	um: Remove CONFIG_IRQ_RELEASE_METHOD	2012-05-21 21:09:37 +02:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-24 13:29:46 -07:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Makefile	kbuild: link of vmlinux moved to a script	2012-05-05 21:19:33 +02:00
Makefile-ia64
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	2008-10-22 22:55:22 -07:00
Makefile-ppc
Makefile-skas	[PATCH] uml makefiles sanitized	2005-09-29 08:46:26 -07:00