Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 18:52:39 +0000 (11:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 18:52:39 +0000 (11:52 -0700)
commit5adf2b03d97111c8955495ba11e8b7db27df8695
tree6e02833c57f4967973ebe14b44ce30ddd85f1ea2
parente811603feb198079bcdb3f75f72cbf9681de2062
parent0e241ffd306c0896bb9959be7faa4d4cfcb706d9
Merge branch 'core-fixes-for-linus' of git://git./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