diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 15:52:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 15:52:19 +1000 |
| commit | 9072f428eda1c472d8a6c2c89500666e9040a59c (patch) | |
| tree | 42dd36f0b933848f7dd1239ae55a4151fcb3a5f9 /arch/um | |
| parent | c3efeb3aec625fe8a873429e06a67ba6263f95b4 (diff) | |
| parent | 11e567a7c051cb881a7c0f2b6791450b66153d64 (diff) | |
Merge commit 'edac-amd/for-next'
Conflicts:
arch/x86/kernel/smpboot.c
include/linux/topology.h
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions