diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-24 17:08:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-24 17:08:15 -0400 |
| commit | d1f3e68efb4c98fa229b39ff09a8984ef16cafa4 (patch) | |
| tree | 48191a1e73f1afd1235331ce1597637ed71193aa /mm/fremap.c | |
| parent | cb9cae0395d70fc4539f6904c11d3a14c0001006 (diff) | |
| parent | 5dad6c39d156fbbde0b0ef170d9173feffdeb546 (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:
o2dlm: force free mles during dlm exit
ocfs2: Sync inode flags with ext2.
ocfs2: Move 'wanted' into parens of ocfs2_resmap_resv_bits.
ocfs2: Use cpu_to_le16 for e_leaf_clusters in ocfs2_bg_discontig_add_extent.
ocfs2: update ctime when changing the file's permission by setfacl
ocfs2/net: fix uninitialized ret in o2net_send_message_vec()
Ocfs2: Handle empty list in lockres_seq_start() for dlmdebug.c
Ocfs2: Re-access the journal after ocfs2_insert_extent() in dxdir codes.
ocfs2: Fix lockdep warning in reflink.
ocfs2/lockdep: Move ip_xattr_sem out of ocfs2_xattr_get_nolock.
Diffstat (limited to 'mm/fremap.c')
0 files changed, 0 insertions, 0 deletions