summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_da_btree.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2008-11-14 01:29:12 +0100
committerJames Morris <jmorris@namei.org>2008-11-14 01:29:12 +0100
commit2b828925652340277a889cbc11b2d0637f7cdaf7 (patch)
tree32fcb3d3e466fc419fad2d3717956a5b5ad3d35a /fs/xfs/xfs_da_btree.h
parentCRED: Allow kernel services to override LSM settings for task actions (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
downloadlinux-2b828925652340277a889cbc11b2d0637f7cdaf7.tar.xz
linux-2b828925652340277a889cbc11b2d0637f7cdaf7.zip
Merge branch 'master' into next
Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/xfs/xfs_da_btree.h')
0 files changed, 0 insertions, 0 deletions