summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/pgtable_32.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-30 01:42:39 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-30 01:42:39 +0400
commit9623e5a23724d09283c238960946ec6f65733afe (patch)
tree5fc1e3ef74ae13ff28c2357f35579af5fdc3f045 /arch/x86/include/asm/pgtable_32.h
parent9f321603724be7386ea39ea41fd885954db60a4a (diff)
parent14741472a05245ed5778aa0aec055e1f920b6ef8 (diff)
downloadlinux-9623e5a23724d09283c238960946ec6f65733afe.tar.xz
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: Fix a race in o2dlm lockres mastery Ocfs2: Handle deletion of reflinked oprhan inodes correctly. Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir. ocfs2: Clear undo bits when local alloc is freed ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block. ocfs2: Fix the update of name_offset when removing xattrs ocfs2: Always try for maximum bits with new local alloc windows ocfs2: set i_mode on disk during acl operations ocfs2: Update i_blocks in reflink operations. ocfs2: Change bg_chain check for ocfs2_validate_gd_parent. [PATCH] Skip check for mandatory locks when unlocking
Diffstat (limited to 'arch/x86/include/asm/pgtable_32.h')
0 files changed, 0 insertions, 0 deletions