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	[PATCH] swsusp: fix suspend when console is in VT_AUTO+KD_GRAPHICS mode	2007-03-16 19:25:05 -07:00
disk.c	driver core: make /sys/power a kobject	2008-01-24 20:40:25 -08:00
Kconfig	serial: turn serial console suspend a boot rather than compile time option	2007-10-18 14:37:19 -07:00
main.c	driver core: make /sys/power a kobject	2008-01-24 20:40:25 -08:00
Makefile	Introduce CONFIG_SUSPEND for suspend-to-Ram and standby	2007-07-29 16:45:38 -07:00
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	WorkStruct: Pass the work_struct pointer instead of context data	2006-11-22 14:55:48 +00:00
process.c	power: Use task_is_*	2007-12-06 17:34:47 -05:00
snapshot.c	trivial copy_data_pages() tidy up	2007-10-20 02:26:04 +02:00
swap.c	swsusp: introduce restore platform operations	2007-07-19 10:04:42 -07:00
swsusp.c	Hibernation: Check if ACPI is enabled during restore in the right place	2007-10-18 14:37:20 -07:00
user.c	freezer: do not sync filesystems from freeze_processes	2007-10-18 14:37:18 -07:00