diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-02-04 09:01:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 09:01:12 +0100 |
| commit | 0967160ad615985c7c35443156ea9aecc60c37b8 (patch) | |
| tree | 658f728aff1be23540180091b718452a6848a6b0 /arch/x86/kernel/i387.c | |
| parent | perf: Decouple unthrottling and rotating (diff) | |
| parent | Merge tag 'pr-20150201-x86-entry' of git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux into x86/asm (diff) | |
| download | linux-dev-0967160ad615985c7c35443156ea9aecc60c37b8.tar.xz linux-dev-0967160ad615985c7c35443156ea9aecc60c37b8.zip | |
Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/i387.c')
0 files changed, 0 insertions, 0 deletions