From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2008 15:25:29 +0000 (-0700)
Subject: Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7bb545d86825e635cab33a1dd81ca0ad7b92887;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'semaphore' of git://git./linux/kernel/git/willy/misc

* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
  Remove DEBUG_SEMAPHORE from Kconfig
  Improve semaphore documentation
  Simplify semaphore implementation
  Add down_timeout and change ACPI to use it
  Introduce down_killable()
  Generic semaphore implementation
  Add semaphore.h to kernel_lock.c
  Fix quota.h includes
---

d7bb545d86825e635cab33a1dd81ca0ad7b92887