Skip to content
Commit 651dab42 authored by Arjan van de Ven's avatar Arjan van de Ven
Browse files

Merge commit 'linus/master' into merge-linus 

Conflicts:

	arch/x86/kvm/i8254.c
parents 40b86062 2e532d68
Expand all 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