]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'upstream/microcode' into upstream/xen
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Thu, 22 Sep 2011 22:24:11 +0000 (15:24 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Thu, 22 Sep 2011 22:24:11 +0000 (15:24 -0700)
commite0625ab3e58fdc3dcedf4d1fabf61cea070df32a
treee0db4f4cb127f2ba70805f5e86fe9be01a47d444
parent3b4866cc73e661c28713b42e590f597a94f21e32
parent430bdcaf0b9610df37aa83b21974fea22f99a624
Merge branch 'upstream/microcode' into upstream/xen

* upstream/microcode:
  xen: add CPU microcode update driver
  xen dom0: Add support for the platform_ops hypercall

Conflicts:
include/xen/interface/xen.h
arch/x86/kernel/Makefile