commit | 5adf2b03d97111c8955495ba11e8b7db27df8695 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 01 11:52:39 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 01 11:52:39 2008 -0700 |
tree | 6e02833c57f4967973ebe14b44ce30ddd85f1ea2 | |
parent | e811603feb198079bcdb3f75f72cbf9681de2062 [diff] | |
parent | 0e241ffd306c0896bb9959be7faa4d4cfcb706d9 [diff] |
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