| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 23 Jul 2011 00:02:38 +0000 (17:02 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 23 Jul 2011 00:02:38 +0000 (17:02 -0700) |
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, smpboot: Mark the names[] array in __inquire_remote_apic() as const
x86: Convert vmalloc()+memset() to vzalloc()
x86, smpboot: Mark the names[] array in __inquire_remote_apic() as const
x86: Convert vmalloc()+memset() to vzalloc()
| 1 | 2 | |||
|---|---|---|---|---|
| arch/x86/kernel/smpboot.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/x86/kernel/smpboot.c
Simple merge