Skip to content
Commit 722f2a6c authored by Vegard Nossum's avatar Vegard Nossum
Browse files

Merge commit 'linus/master' into HEAD 



Conflicts:
	MAINTAINERS

Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
parents 7a0aeb14 45e3e193
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