]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:05:16 +0000 (11:05 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:05:16 +0000 (11:05 -0700)
* 'topic/uek-4.1/xen' of git://ca-git.us.oracle.com/linux-uek:
  xen/microcode: Use dummy microcode_ops for non initial domain guest
  xen/microcode: Fix compile warning.
  microcode_xen: Add support for AMD family >= 15h
  x86/microcode: check proper return code.
  xen: add CPU microcode update driver
  x86/xen: Disable APIC PM for Xen PV guests
  xen/pvhvm: Support more than 32 VCPUs when migrating (v3).


Trivial merge