Skip to content
Commit 5f1b5664 authored by David Sterba's avatar David Sterba
Browse files

Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6 

# Conflicts:
#	fs/btrfs/file.c
parents 388f7b1d 65bfa658
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment