mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge branch 'for-linus' into raid56-experimental
Conflicts: fs/btrfs/volumes.c Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
commit
0e4e026366
14 changed files with 300 additions and 98 deletions
137
fs/btrfs/inode.c
137
fs/btrfs/inode.c
129
fs/btrfs/ioctl.c
129
fs/btrfs/ioctl.c
Loading…
Add table
Add a link
Reference in a new issue