| commit | d7bb545d86825e635cab33a1dd81ca0ad7b92887 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 18 08:25:29 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 18 08:25:29 2008 -0700 |
| tree | 34da4139ef06ceab6549aea3906639c7413978c8 | |
| parent | 75e98b34155264d943aa53edce465e87f3ccbadf [diff] | |
| parent | 2342e51ba2b52a7f5b78227e6faa4603ed3632a0 [diff] |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/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