| commit | 8650e51ac94b5fe93c02e3c8fef02e416f14501c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 01 18:56:55 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 01 18:56:55 2008 -0800 |
| tree | 0fc5f05fb578e3499182f27f63787a9df8e77a43 | |
| parent | 7ac01108e71ca8ccc2ded4ee98035d0e5db9c981 [diff] | |
| parent | d6b58f89f7257c8099c2260e2bea042a917d6cdf [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: ocfs2: fix regression in ocfs2_read_blocks_sync() ocfs2: fix return value set in init_dlmfs_fs() ocfs2: Small documentation update ocfs2: fix wake_up in unlock_ast ocfs2: initialize stack_user lvbptr ocfs2: comments typo fix