diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-16 09:37:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-16 09:37:37 +0100 |
| commit | 1fe3f29e4a908461be16a9388e73837157cc7942 (patch) | |
| tree | 49d1b6a457d0faaccf477d7100fe9778fc637730 /security | |
| parent | 1926e54f115725a9248d0c4c65c22acaf94de4c4 (diff) | |
| parent | 58122bf1d856a4ea9581d62a07c557d997d46a19 (diff) | |
| parent | e2c7698cd61f11d4077fdb28148b2d31b82ac848 (diff) | |
| parent | f2cc8e0791c70833758101d9756609a08dd601ec (diff) | |
Merge branches 'x86/fpu', 'x86/mm' and 'x86/asm' into x86/pkeys
Provide a stable basis for the pkeys patches, which touches various
x86 details.
Signed-off-by: Ingo Molnar <mingo@kernel.org>