]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75e98b3 2342e51)
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Apr 2008 15:25:29 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Apr 2008 15:25:29 +0000 (08:25 -0700)
* '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

1  2 
arch/s390/kernel/Makefile patch | diff1 | diff2 | blob | history
lib/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc arch/s390/kernel/Makefile
Simple merge
diff --cc lib/Kconfig.debug
Simple merge
Unnamed repository; edit this file 'description' to name the repository.