diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-30 13:21:40 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-30 13:21:40 +0300 |
| commit | 78726ee5ff3fc76697c8754e0f546915bd61e7c6 (patch) | |
| tree | 3205c3066b632aade9bad9e1951586b065ac2192 /arch/x86/kernel/hpet.c | |
| parent | 1e423bff959e48166f5b7efca01fdb0dbdf05846 (diff) | |
| parent | a1ff5726081858a9ad98934eff7af6616c576875 (diff) | |
| download | linux-78726ee5ff3fc76697c8754e0f546915bd61e7c6.tar.xz | |
Merge branch 'x86/cpu' into x86/asm, to avoid conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
0 files changed, 0 insertions, 0 deletions