You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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..		17 years ago
..
Makefile	FS: Remove dead code	17 years ago
cache.c	[PATCH] struct path: convert smbfs	18 years ago
dir.c	Detach sched.h from mm.h	18 years ago
file.c	smbfs: fix debug builds	18 years ago
getopt.c	Linux-2.6.12-rc2	20 years ago
getopt.h	Linux-2.6.12-rc2	20 years ago
inode.c	smbfs: fix debug builds	18 years ago
ioctl.c	Linux-2.6.12-rc2	20 years ago
proc.c	smbfs: fix debug builds	18 years ago
proto.h	[PATCH] mark struct inode_operations const 3	18 years ago
request.c	Remove commented-out code copied from NFS	17 years ago
request.h	Linux-2.6.12-rc2	20 years ago
smb_debug.h	Linux-2.6.12-rc2	20 years ago
smbiod.c	smbfs: fix debug builds	18 years ago
sock.c	header cleaning: don't include smp_lock.h when not used	18 years ago
symlink.c	header cleaning: don't include smp_lock.h when not used	18 years ago