diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 14:21:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-08-31 14:21:16 +1000 |
| commit | dc978c7a7a2ceaa06db8d62ea5657d269376c98b (patch) | |
| tree | fa284e58a645017846e873390965db138786edd0 /arch/x86/kernel/smp.c | |
| parent | bc4c05687705979c74c4016f8ffb7c750df6ce88 (diff) | |
| parent | b4672adfea312ed0c69a338f787340ca69438b83 (diff) | |
Merge remote-tracking branch 'kvmtool/master'
Conflicts:
include/net/9p/9p.h
Diffstat (limited to 'arch/x86/kernel/smp.c')
0 files changed, 0 insertions, 0 deletions