Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c