projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 659dba3 828ae6a)
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)
commit741441ab7800f1eb031e74fd720f4f8f361678ed
treecd265afa96c3753116f570e483408ed8a94fe1d7tree | snapshot
parent659dba34807692a6ebd55e7859dff2c7cb1b005dcommit | diff
parent828ae6afbef03bfe107a4a8cc38798419d6a2765commit | diff
Merge branch 'upstream-linus' of git://git./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
Domain: System / Uncategorized;