tree 9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead
parent 3fde80e94c2bbffbb13f5faa3340cf438440ebea
parent b552068999b0b05087c454e525b30b785c79dc9b
author Linus Torvalds <torvalds@linux-foundation.org> 1216927480 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216927480 -0700

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 __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