Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 16:48:29 +0000 (08:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 16:48:29 +0000 (08:48 -0800)
commit8c8ae4e8cd5a67467192f3361eeec463694f8ed8
treec4216f3f8cb89dd6a12e727d886abc0f6ab74c83
parenta1e8fad5900fa94adb500c6e0dfd60a307f7a3c9
parentd9b8ca8474fd4fdd43ba6d97a4fee8b49b978067
Merge branch 'stable/generic' of git://git./linux/kernel/git/konrad/xen

* 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: HVM X2APIC support
  apic: Move hypervisor detection of x2apic to hypervisor.h
arch/x86/kernel/apic/apic.c
arch/x86/xen/enlighten.c