]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/not-upstreamed' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 05:35:13 +0000 (00:35 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 24 Feb 2012 05:35:13 +0000 (00:35 -0500)
commit98687483f3918349f96697261b491ee41b824871
tree0e4f4ddf25385924c8f6d61c3edb9ed8c36857a2
parent1cd2863a558b8dd690fea4b9958ac6294f73792f
parent462aa20d0fe3ed83fb39fe848723dd50ffd6763e
Merge branch 'stable/not-upstreamed' into uek2-merge

* stable/not-upstreamed:
  Xen: Export host physical CPU information to dom0
  xen/mce: Change the machine check point
  Add mcelog support from xen platform

Conflicts:
drivers/xen/Kconfig
drivers/xen/Makefile
arch/x86/include/asm/xen/hypercall.h
arch/x86/xen/enlighten.c
drivers/xen/Kconfig
drivers/xen/Makefile
include/xen/interface/platform.h
include/xen/interface/xen.h