]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'upstream/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 9 Nov 2011 21:04:46 +0000 (16:04 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 9 Nov 2011 21:04:46 +0000 (16:04 -0500)
* 'upstream/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen: add CPU microcode update driver
  xen: add dom0_op hypercall
  xen/acpi: Domain0 acpi parser related platform hypercall

1  2 
arch/x86/include/asm/xen/hypercall.h
arch/x86/kernel/Makefile
include/xen/interface/xen.h

Simple merge
Simple merge
Simple merge