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
..
2007-05-11 05:38:25 -04:00
2005-04-16 15:20:36 -07:00
2007-07-19 13:48:00 -07:00
2007-05-10 09:35:30 -07:00
2006-06-21 11:19:22 -07:00
2006-06-21 11:19:22 -07:00
2005-04-16 15:20:36 -07:00
2007-12-07 14:28:02 -08:00
2007-07-09 13:37:44 -07:00
2007-07-29 17:09:29 -07:00
2007-05-11 14:55:43 -07:00
2007-11-06 15:40:52 -08:00
2006-12-12 12:00:55 -08:00
2007-10-17 14:28:38 -07:00
2007-05-11 14:55:43 -07:00
2007-12-19 12:30:47 -08:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-12-07 10:48:19 -08:00
2007-12-06 17:20:22 -05:00
2007-05-11 14:55:43 -07:00
2005-04-16 15:20:36 -07:00
2007-05-08 14:51:59 -07:00
2008-01-25 21:07:59 +01:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2007-06-26 13:33:10 -07:00