From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Feb 2008 00:45:47 +0000 (+1100)
Subject: Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy... 
X-Git-Tag: v2.6.25-rc1~1125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75659ca0c10992dcb39258518368a0f6f56e935d;p=pandora-kernel.git

Merge branch 'task_killable' of git://git./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..
---

75659ca0c10992dcb39258518368a0f6f56e935d
Reading git-diff-tree failed