kernel-fxtec-pro1x/include
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
..
acpi
asm-alpha alpha: fix x86.git merge build error 2008-01-30 23:27:58 +01:00
asm-arm [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
asm-avr32
asm-blackfin
asm-cris
asm-frv
asm-generic asm-generic/tlb.h: build fix 2008-01-31 22:05:48 +01:00
asm-h8300
asm-ia64 ia64: on UP percpu variables are not small memory model 2008-01-30 23:27:58 +01:00
asm-m32r
asm-m68k
asm-m68knommu
asm-mips
asm-parisc x86: remove flush_agp_mappings() 2008-01-30 13:34:07 +01:00
asm-powerpc Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2008-01-31 13:37:27 +11:00
asm-ppc
asm-s390 s390: use generic percpu linux-2.6.git 2008-01-30 23:27:58 +01:00
asm-sh
asm-sparc
asm-sparc64 SPARC64: use generic percpu 2008-01-30 23:27:58 +01:00
asm-um
asm-v850
asm-x86 x86: uninline __pte_free_tlb() and __pmd_free_tlb() 2008-01-31 22:05:48 +01:00
asm-xtensa
crypto
keys
linux Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc 2008-02-01 11:45:47 +11:00
math-emu
media
mtd
net
pcmcia
rdma
rxrpc
scsi [SCSI] scsi_debug: add XDWRITEREAD_10 support 2008-01-30 13:14:25 -06:00
sound [ALSA] version 1.0.16rc2 2008-01-31 17:40:18 +01:00
video
xen
Kbuild