Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

344c21c3

Commit 344c21c3 authored 14 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'x86/amd-nb' into x86/urgent


Merge reason: This is one followup commit that was not in x86/mm - merge it via the urgent path

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parents b87cf80a 84fd1d35

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/include/asm/amd_nb.h 10 additions, 6 deletions

arch/x86/include/asm/amd_nb.h
arch/x86/kernel/amd_nb.c 88 additions, 12 deletions

arch/x86/kernel/amd_nb.c
arch/x86/kernel/cpu/amd.c 7 additions, 3 deletions

arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/intel_cacheinfo.c 61 additions, 15 deletions

arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/smpboot.c 1 addition, 0 deletions

arch/x86/kernel/smpboot.c
arch/x86/pci/amd_bus.c 1 addition, 1 deletion

arch/x86/pci/amd_bus.c
include/linux/pci_ids.h 1 addition, 0 deletions

include/linux/pci_ids.h

with 169 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment