diff options
| author | Chris Mason <[email protected]> | 2011-05-23 10:30:52 +0000 |
|---|---|---|
| committer | Chris Mason <[email protected]> | 2011-05-23 10:30:52 +0000 |
| commit | 712673339a0d085358fd1cd3a6477cc7979bb69f (patch) | |
| tree | b2e268685e3cbba19a4adb2a47d853e4e461fcfc /fs/jbd2/commit.c | |
| parent | Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arn... (diff) | |
| parent | btrfs: add readonly flag (diff) | |
| download | kernel-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.gz kernel-712673339a0d085358fd1cd3a6477cc7979bb69f.zip | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers
Conflicts:
fs/btrfs/Makefile
fs/btrfs/ctree.h
fs/btrfs/volumes.h
Signed-off-by: Chris Mason <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions