Skip to content
Commit bcd6acd5 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next 

Conflicts:
	include/linux/kvm.h
parents 11c34c7d 3ff6a468
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