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
..
boot	Kbuild: Use dtc's -d (dependency) option	2012-02-14 21:14:44 -05:00
configs	C6X: build infrastructure	2011-10-06 19:47:25 -04:00
include/asm	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
kernel	move key_repace_session_keyring() into tracehook_notify_resume()	2012-05-23 22:09:20 -04:00
lib	C6X: library code	2011-10-06 19:48:23 -04:00
mm	C6X: memory management and DMA support	2011-10-06 19:47:37 -04:00
platforms	Disintegrate asm/system.h for C6X	2012-03-28 18:30:02 +01:00
Kconfig	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
Makefile	C6X: build infrastructure	2011-10-06 19:47:25 -04:00