From: Linus Torvalds 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://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=7540081c6b16dc941895bca840749cabfd0d3b48;hp=b552068999b0b05087c454e525b30b785c79dc9b 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 --- Reading git-diff-tree failed