diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 20:29:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 20:29:05 -0800 |
| commit | 931ed94430e36b9bea3904572424116092ba5663 (patch) | |
| tree | 6ac8895f63ec90fdc2baddbd42bdc31da72e1e41 /mm/memory.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 7aee47b0bb9f93baecdbea205e878fe0f155f7da (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Trivial cleanup of jbd compatibility layer removal
ocfs2: Refresh documentation
ocfs2: return f_fsid info in ocfs2_statfs()
ocfs2: duplicate inline data properly during reflink.
ocfs2: Move ocfs2_complete_reflink to the right place.
ocfs2: Return -EINVAL when a device is not ocfs2.
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions