Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 19:24:40 +0000 (12:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 19:24:40 +0000 (12:24 -0700)
commit7540081c6b16dc941895bca840749cabfd0d3b48
tree9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead
parent3fde80e94c2bbffbb13f5faa3340cf438440ebea
parentb552068999b0b05087c454e525b30b785c79dc9b
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 __DECLARE_SEMAPHORE_GENERIC
  Remove asm/semaphore.h
  Remove use of asm/semaphore.h
  Add missing semaphore.h includes
  Remove mention of semaphores from kernel-locking