]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream/microcode' into upstream/xen
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 23 Sep 2011 18:50:34 +0000 (11:50 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Fri, 23 Sep 2011 18:50:34 +0000 (11:50 -0700)
* upstream/microcode:
  xen: add CPU microcode update driver
  xen: add dom0_op hypercall
  xen/acpi: Domain0 acpi parser related platform hypercall

1  2 
arch/x86/kernel/Makefile

Simple merge