From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Apr 2008 22:41:27 +0000 (-0700)
Subject: Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
X-Git-Tag: v2.6.26-rc1~1130
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=429f731dea577bdd43693940cdca524135287e6a;p=~emulex%2Finfiniband.git

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:
  Deprecate the asm/semaphore.h files in feature-removal-schedule.
  Convert asm/semaphore.h users to linux/semaphore.h
  security: Remove unnecessary inclusions of asm/semaphore.h
  lib: Remove unnecessary inclusions of asm/semaphore.h
  kernel: Remove unnecessary inclusions of asm/semaphore.h
  include: Remove unnecessary inclusions of asm/semaphore.h
  fs: Remove unnecessary inclusions of asm/semaphore.h
  drivers: Remove unnecessary inclusions of asm/semaphore.h
  net: Remove unnecessary inclusions of asm/semaphore.h
  arch: Remove unnecessary inclusions of asm/semaphore.h
---

429f731dea577bdd43693940cdca524135287e6a