From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Aug 2008 18:52:39 +0000 (-0700)
Subject: Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.27-rc2~97
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5adf2b03d97111c8955495ba11e8b7db27df8695;p=linux-2.6-omap-h63xx.git

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  locking: fix mutex @key parameter kernel-doc notation
---

5adf2b03d97111c8955495ba11e8b7db27df8695