diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-16 11:33:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-16 11:34:01 -0400 |
| commit | 344c21c32287755b5cda0eeb84adb4546a57c1db (patch) | |
| tree | c1a7e2332e4650b62c451279d84e0ed0890995fa /arch/ia64/include/asm/topology.h | |
| parent | b87cf80af3ba4b4c008b4face3c68d604e1715c6 (diff) | |
| parent | 84fd1d35cc868a4f7590b6dbdae2d7761287b97a (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>
Diffstat (limited to 'arch/ia64/include/asm/topology.h')
0 files changed, 0 insertions, 0 deletions