]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e24b1b c899889)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 12 Dec 2006 18:21:01 +0000 (10:21 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 12 Dec 2006 18:21:01 +0000 (10:21 -0800)
commit048a1509766b0e62ba7decf352e70d50253e5432
treecd265afa96c3753116f570e483408ed8a94fe1d7tree | snapshot
parent4e24b1bdd8fcd1513af42d6977477b1fb7250c5fcommit | diff
parentc89988960224b362470a6c8c3b8e28c813e082efcommit | diff
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:
  [patch 3/3] OCFS2 Configurable timeouts - Protocol changes
  [patch 2/3] OCFS2 Configurable timeouts
  [patch 1/3] OCFS2 - Expose struct o2nm_cluster
  ocfs2: Synchronize feature incompat flags in ocfs2_fs.h
  ocfs2: update mount option documentation
  ocfs2: local mounts
Linux Kernel Source Tree.