]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commite5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c
tree5e8fbbcbb7516c8eca9c431b47c70c752823af39
parentbfa271d026fef5d8db9a95342c38eab6f7b287a2
parentd24fbcda0c4988322949df3d759f1cfb32b32953
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.