]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba0fc70 18c6ac3)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jul 2008 04:48:26 +0000 (21:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jul 2008 04:48:26 +0000 (21:48 -0700)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()


Trivial merge
Linux 2.6 source tree