]> 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>
Tue, 12 Jun 2012 18:31:08 +0000 (14:31 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 12 Jun 2012 18:31:08 +0000 (14:31 -0400)
commitfbe221c704dc726f2bce70d3ad4c975b26176acb
tree1ee683368abd46941bfa00914ded79ab82d6815d
parent6df81b618fcf62dbea134ff3db37f2977ce88a41
parentb834412ace0aa3fc98b6186413118b57f9734c03
Merge branch 'stable/not-upstreamed' into uek2-merge

* stable/not-upstreamed:
  Revert "xen/mce: Add mcelog support for Xen platform"
  Revert "xen/mce: Register native mce handler as vMCE bounce back point"

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