Merge branch 'core/percpu' into x86/paravirt
commit9b7ed8faa034fc2d350e2eff5c68680eb5c43a07
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 30 Jan 2009 22:50:57 +0000 (30 14:50 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 30 Jan 2009 22:50:57 +0000 (30 14:50 -0800)
tree5c94c34ad30e312604c1ce4f08ab6631b64a94f5
parent6522869c34664dd5f05a0a327e93915b1281c90d
parentc43e0e46adf79c321ed3fbf0351e1005fb8a2413
Merge branch 'core/percpu' into x86/paravirt
arch/x86/include/asm/paravirt.h
arch/x86/xen/enlighten.c