]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 20:46:35 +0000 (12:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 20:46:35 +0000 (12:46 -0800)
commitca50e4c24c790ffedd6c1b45f7e3ef59dc4aa97a
tree5e8fbbcbb7516c8eca9c431b47c70c752823af39
parentf6893921adebfc85b7f500988422efaca42e8300
parent548e03ad09dfcce1f942a2cfbd1acf317fef53a8
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Negotiate locking protocol versions.