From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Jul 2008 19:24:40 +0000 (-0700)
Subject: Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
X-Git-Tag: v2.6.27-rc1~518
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7540081c6b16dc941895bca840749cabfd0d3b48;p=linux-2.6

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

7540081c6b16dc941895bca840749cabfd0d3b48