www.infradead.org Git - users/jedix/linux-maple.git/commit

author	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	Fri, 24 Feb 2012 04:54:24 +0000 (23:54 -0500)
committer	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	Fri, 24 Feb 2012 04:56:46 +0000 (23:56 -0500)
commit	f88c1e80c3e1e3a250a6ed5249987f987f7dd0c0
tree	ab38202d55c855463b1ed8c232a9940eddb034dc	tree
parent	af87c1f1aac1f4faa384629f60ee3ac62c2ef9d7	commit \| diff
parent	1941db93a0ae5c4c54e2342075e8e9cad22a07dc	commit \| diff

Merge branch 'stable/not-upstreamed' into uek2-merge

* stable/not-upstreamed:
  x86/microcode: check proper return code.
  xen: add CPU microcode update driver
  xen: add dom0_op hypercall
  xen/acpi: Domain0 acpi parser related platform hypercall

Conflicts:
arch/x86/xen/Kconfig
include/xen/interface/platform.h

Note: The approach in upstream is to get rid of the microcode
driver altogether and do at early bootup. Even as early as
syslinux/pxeboot or initial kernel image. But those patches
are not yet ready.