Skip to content
Commit e89c6fdf authored by NeilBrown's avatar NeilBrown
Browse files

Merge linux-block/for-4.3/core into md/for-linux 



There were a few conflicts that are fairly easy to resolve.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parents c3cce6cd 1081230b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment