Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus

Browse source

Conflicts:
	fs/btrfs/transaction.c

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

...

This commit is contained in:

Chris Mason 2011-06-17 14:16:13 -04:00

parent 7585717f30 ed0ca14021

commit e038dca803

3 changed files with 14 additions and 3 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

1

fs/btrfs/inode.c

View file

2

fs/btrfs/ioctl.c

View file

14

fs/btrfs/transaction.c

View file