Commit 0a6eab70 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge remote-tracking branch 'kspp/for-next/kspp' 

# Conflicts:
#	arch/x86/kernel/fpu/xstate.c
parents eedcc9b5 ec2f8778
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment