diff options
| author | David Sterba <[email protected]> | 2016-05-16 13:46:29 +0000 |
|---|---|---|
| committer | David Sterba <[email protected]> | 2016-05-16 13:46:29 +0000 |
| commit | 680834ca0ad4e9827048d4bda1e38db69c3dd1e4 (patch) | |
| tree | 595935ba3afc91dce9be83ca65932f3cf1379436 /fs/btrfs/dev-replace.c | |
| parent | Merge branch 'foreign/anand/dev-del-by-id-ext' into for-chris-4.7-20160516 (diff) | |
| parent | btrfs: uapi/linux/btrfs_tree.h, use __u8 and __u64 (diff) | |
| download | kernel-680834ca0ad4e9827048d4bda1e38db69c3dd1e4.tar.gz kernel-680834ca0ad4e9827048d4bda1e38db69c3dd1e4.zip | |
Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516
# Conflicts:
# include/uapi/linux/btrfs.h
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions