James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next ... Conflicts: fs/attr.c Resolve conflict manually. Signed-off-by: James Morris <jmorris@namei.org>		2011-08-09 10:31:03 +10:00
..
acl.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-08-02 21:14:05 -10:00
async-thread.c
async-thread.h
btrfs_inode.h	Btrfs: use the commit_root for reading free_space_inode crcs	2011-07-27 12:46:48 -04:00
compat.h
compression.c	Btrfs: check the nodatasum flag when writing compressed files	2011-08-01 14:30:46 -04:00
compression.h	btrfs: rename variables clashing with global function names	2011-05-02 13:57:19 +02:00
ctree.c	Btrfs: remove lockdep magic from btrfs_next_leaf	2011-07-27 12:46:47 -04:00
ctree.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-08-02 21:14:05 -10:00
delayed-inode.c	Btrfs: switch the btrfs tree locks to reader/writer	2011-07-27 12:46:46 -04:00
delayed-inode.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
delayed-ref.c	btrfs: remove old unused commented out code	2011-05-06 12:34:10 +02:00
delayed-ref.h	btrfs: remove all unused functions	2011-05-06 12:34:03 +02:00
dir-item.c	Btrfs: remove redundant code for dir item lookup	2011-08-01 14:30:48 -04:00
disk-io.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-07-27 16:43:52 -07:00
disk-io.h	Btrfs: make a lockdep class for each root	2011-07-27 12:46:46 -04:00
export.c	Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers	2011-05-21 09:27:38 -04:00
export.h
extent-tree.c	Btrfs: don't print the leaf if we had an error	2011-08-01 14:30:45 -04:00
extent_io.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-08-02 21:14:05 -10:00
extent_io.h	Btrfs: remove unused members from struct extent_state	2011-08-01 14:30:50 -04:00
extent_map.c	Btrfs: clean up code for merging extent maps	2011-08-01 14:30:50 -04:00
extent_map.h	btrfs: drop gfp parameter from alloc_extent_map	2011-05-02 13:57:21 +02:00
file-item.c	Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/btrfs-error-handling into for-linus	2011-08-01 14:27:34 -04:00
file.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-08-02 21:14:05 -10:00
free-space-cache.c	Btrfs: use find_or_create_page instead of grab_cache_page	2011-07-27 12:46:43 -04:00
free-space-cache.h	btrfs: remove all unused functions	2011-05-06 12:34:03 +02:00
hash.h
inode-item.c	Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item	2011-05-23 13:24:39 -04:00
inode-map.c	btrfs: add helper for fs_info->closing	2011-06-04 08:11:22 -04:00
inode-map.h
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-08-02 21:14:05 -10:00
ioctl.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-08-02 21:14:05 -10:00
ioctl.h	Btrfs: add mount -o auto_defrag	2011-05-26 17:52:15 -04:00
Kconfig
locking.c	Btrfs: switch the btrfs tree locks to reader/writer	2011-07-27 12:46:46 -04:00
locking.h	Btrfs: switch the btrfs tree locks to reader/writer	2011-07-27 12:46:46 -04:00
lzo.c
Makefile	Btrfs: make acl functions really no-op if acl is not enabled	2011-08-01 14:30:48 -04:00
ordered-data.c
ordered-data.h
orphan.c
print-tree.c
print-tree.h
relocation.c	Merge branch 'integration' into for-linus	2011-07-27 16:18:13 -04:00
root-tree.c	btrfs: make btrfs_set_root_node void	2011-08-01 14:30:44 -04:00
scrub.c	btrfs: remove unneeded includes from scrub.c	2011-06-10 14:59:52 +02:00
struct-funcs.c	Btrfs: stop using highmem for extent_buffers	2011-07-27 12:46:45 -04:00
super.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-07-08 23:25:45 -07:00
sysfs.c	btrfs: Remove unused sysfs code	2011-06-17 14:54:18 -04:00
transaction.c	Btrfs: remove a BUG_ON() in btrfs_commit_transaction()	2011-08-01 14:30:47 -04:00
transaction.h	Merge branch 'for-chris' of	2011-05-28 07:00:39 -04:00
tree-defrag.c	btrfs: drop unused parameter from btrfs_release_path	2011-05-02 13:57:22 +02:00
tree-log.c	Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/btrfs-error-handling into for-linus	2011-08-01 14:27:34 -04:00
tree-log.h	btrfs: remove unused function prototypes	2011-05-04 14:01:26 +02:00
version.h
volumes.c	Merge branch 'alloc_path' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/btrfs-error-handling into for-linus	2011-08-01 14:27:34 -04:00
volumes.h	Merge branch 'cleanups_and_fixes' into inode_numbers	2011-05-23 14:37:47 -04:00
xattr.c	Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next	2011-08-09 10:31:03 +10:00
xattr.h
zlib.c