projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
659dba3
828ae6a
)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
author
Linus Torvalds
<torvalds@woody.osdl.org>
Tue, 12 Dec 2006 18:21:01 +0000
(10:21 -0800)
committer
Linus Torvalds
<torvalds@woody.osdl.org>
Tue, 12 Dec 2006 18:21:01 +0000
(10:21 -0800)
* '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
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff