Skip to content
GitLab
Commit 19fdb9ee authored by NeilBrown's avatar NeilBrown
Browse files

Merge commit '3ff195b0' into for-linus 



Conflicts:
	drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parents be6800a7 3ff195b0
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
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