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:

  c447e76b4cab ("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
..
2014-10-09 11:35:48 +03:00
2015-03-25 15:04:57 +01:00
2015-05-19 15:47:30 +02:00
2011-03-11 14:25:50 +00:00
2011-10-29 21:20:22 +02:00
2014-04-30 19:49:37 +01:00
2012-10-06 03:04:57 +09:00
2014-08-06 18:01:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-12 18:54:15 -08:00
2014-05-05 09:09:14 +02:00
2014-08-08 15:57:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-24 08:44:16 +01:00
2015-02-12 18:54:15 -08:00
2012-07-30 17:25:16 -07:00
2014-06-25 17:45:43 -07:00
2015-01-21 16:28:49 +10:30
2015-02-12 18:54:16 -08:00
2015-03-23 22:12:08 -04:00
2015-02-12 18:54:16 -08:00
2015-04-16 19:02:04 -04:00
2015-02-13 21:21:41 -08:00
2013-04-29 18:28:42 -07:00