From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 16:48:29 +0000 (-0800)
Subject: Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
X-Git-Tag: v2.6.38-rc1~435
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c8ae4e8cd5a67467192f3361eeec463694f8ed8;p=karo-tx-linux.git

Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/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
---

8c8ae4e8cd5a67467192f3361eeec463694f8ed8