Skip to content
Commit 061f98e9 authored by Al Viro's avatar Al Viro
Browse files

Merge branch 'superblock-scaling' of... 

Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-next

Conflicts:
	include/linux/fs.h
parents b5f5914c ac05fbb4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment