diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-09 08:57:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-09 08:57:02 -0700 |
| commit | cad46744a308299e1c33a549e3e9c9a5bc468f05 (patch) | |
| tree | cb63f5cf2f6f81b2ea13dce8e17185b1f8f781f2 /mm/mlock.c | |
| parent | cc491e27d31f1bb3dacb309407b47d65669ceb9d (diff) | |
| parent | 97b8f4a9dfd932997677136e11980eb2fafea91d (diff) | |
Merge branch 'fixes' of git://oss.oracle.com/git/tma/linux-2.6
* 'fixes' of git://oss.oracle.com/git/tma/linux-2.6:
ocfs2: Fix orphan add in ocfs2_create_inode_in_orphan
ocfs2: split out ocfs2_prepare_orphan_dir() into locking and prep functions
ocfs2: allow return of new inode block location before allocation of the inode
ocfs2: use ocfs2_alloc_dinode_update_counts() instead of open coding
ocfs2: split out inode alloc code from ocfs2_mknod_locked
Ocfs2: Fix a regression bug from mainline commit(6b933c8e6f1a2f3118082c455eef25f9b1ac7b45).
ocfs2: Fix deadlock when allocating page
ocfs2: properly set and use inode group alloc hint
ocfs2: Use the right group in nfs sync check.
ocfs2: Flush drive's caches on fdatasync
ocfs2: make __ocfs2_page_mkwrite handle file end properly.
ocfs2: Fix incorrect checksum validation error
ocfs2: Fix metaecc error messages
Diffstat (limited to 'mm/mlock.c')
0 files changed, 0 insertions, 0 deletions