Linus Torvalds 75659ca0c1 Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc ... * 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc: (22 commits) Remove commented-out code copied from NFS NFS: Switch from intr mount option to TASK_KILLABLE Add wait_for_completion_killable Add wait_event_killable Add schedule_timeout_killable Use mutex_lock_killable in vfs_readdir Add mutex_lock_killable Use lock_page_killable Add lock_page_killable Add fatal_signal_pending Add TASK_WAKEKILL exit: Use task_is_* signal: Use task_is_* sched: Use task_contributes_to_load, TASK_ALL and TASK_NORMAL ptrace: Use task_is_* power: Use task_is_* wait: Use TASK_NORMAL proc/base.c: Use task_is_* proc/array.c: Use TASK_REPORT perfmon: Use task_is_* ... Fixed up conflicts in NFS/sunrpc manually..		2008-02-01 11:45:47 +11:00
..
console.c
disk.c	driver core: make /sys/power a kobject	2008-01-24 20:40:25 -08:00
Kconfig
main.c	driver core: make /sys/power a kobject	2008-01-24 20:40:25 -08:00
Makefile
pm.c	PM: ACPI and APM must not be enabled at the same time	2008-01-11 12:26:47 -05:00
power.h	Driver Core: switch all dynamic ksets to kobj_sysfs_ops	2008-01-24 20:40:18 -08:00
poweroff.c
process.c
snapshot.c
swap.c
swsusp.c
user.c