]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a26449d e988cf1)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2008 20:11:01 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2008 20:11:01 +0000 (13:11 -0700)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Fix flags in ocfs2_file_lock


Trivial merge
Linux 2.6 source tree