diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-04-22 10:12:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-22 10:13:53 +0200 |
| commit | b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc (patch) | |
| tree | 260890790538b5dffc49bc9ee607d808a6e47b98 /arch/x86/kernel/module.c | |
| parent | x86/entry: Rename is_{ia32,x32}_task() to in_{ia32,x32}_syscall() (diff) | |
| parent | x86 EDAC, sb_edac.c: Take account of channel hashing when needed (diff) | |
| download | wireguard-linux-b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc.tar.xz wireguard-linux-b2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc.zip | |
Merge branch 'x86/urgent' into x86/asm, to fix semantic conflict
'cpu_has_pse' has changed to boot_cpu_has(X86_FEATURE_PSE), fix this
up in the merge commit when merging the x86/urgent tree that includes
the following commit:
103f6112f253 ("x86/mm/xen: Suppress hugetlbfs in PV guests")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/module.c')
0 files changed, 0 insertions, 0 deletions