Skip to content
GitLab
Commit b4ca7615 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'master' into for-linus 



Conflicts:
	fs/pipe.c

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parents 28f4197e 67a3e12b
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