Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers

Browse Source

Conflicts:
	fs/btrfs/free-space-cache.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

...

This commit is contained in:

Chris Mason

2011-05-21 09:27:38 -04:00

parent 61c4f2c81c 82d5902d9c

commit 0965537308

19 changed files with 1408 additions and 638 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

978

fs/btrfs/free-space-cache.c

File diff suppressed because it is too large Load Diff