diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:02:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:02:38 -0700 |
commit | 0a613b647bac0cfab7b7d81f11271883209a70ef (patch) | |
tree | e08bc77eb987ef8f4560c0c46cd4ed54784b23c0 /arch/x86/include/asm/timer.h | |
parent | eb47418dc56baaca33d270a868d8ddaa81150952 (diff) | |
parent | a6c23905ff0d6bbddf590ef0838489ee0f6c74ac (diff) |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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()
Diffstat (limited to 'arch/x86/include/asm/timer.h')
0 files changed, 0 insertions, 0 deletions