Merge branch 'linus' into x86/urgent
[pandora-kernel.git] / arch / x86 / xen / smp.c
Simple merge