Ingo Molnar 3152657f10 Linux 4.1-rc5 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVYnloAAoJEHm+PkMAQRiGCgkH/j3r2djOOm4h83FXrShaHORY p8TBI3FNj4fzLk2PfzqbmiDw2T2CwygB+pxb2Ac9CE99epw8qPk2SRvPXBpdKR7t lolhhwfzApLJMZbhzNLVywUCDUhFoiEWRhmPqIfA3WXFcIW3t5VNXAoIFjV5HFr6 sYUlaxSI1XiQ5tldVv8D6YSFHms41pisziBIZmzhIUg10P6Vv3D0FbE74fjAJwx0 +08zj3EO7yQMv7Aeeq8F8AJ3628142rcZf0NWF5ohlKLRK3gt0cl9jO5U4Co2dDt 29v03LP5EI6jDKkIbuWlqRMq9YxJz7N3wnkzV0EJiqXucoqPLFDqzbxB4gnS1pI= =7vbA -----END PGP SIGNATURE----- Merge branch 'linus' into x86/fpu Resolve semantic conflict in arch/x86/kvm/cpuid.c with: c447e76b4c ("kvm/fpu: Enable eager restore kvm FPU for MPX") By removing the FPU internal include files. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-05-25 09:39:19 +02:00
..
asm	Linux 4.1-rc5	2015-05-25 09:39:19 +02:00
uapi/asm	x86/fpu: Rename xsave.header::xstate_bv to 'xfeatures'	2015-05-19 15:47:35 +02:00