]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1e8fad d9b8ca8)
Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
authorLinus Torvalds <[email protected]>
Mon, 10 Jan 2011 16:48:29 +0000 (08:48 -0800)
committerLinus Torvalds <[email protected]>
Mon, 10 Jan 2011 16:48:29 +0000 (08:48 -0800)
* '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

1  2 
arch/x86/kernel/apic/apic.c patch | diff1 | diff2 | blob | history
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apic/apic.c
Simple merge
diff --cc arch/x86/xen/enlighten.c
Simple merge
Empty description
This page took 0.073171 seconds and 4 git commands to generate.