]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 12 Jun 2012 18:33:31 +0000 (14:33 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 12 Jun 2012 18:34:27 +0000 (14:34 -0400)
commit9c9aae5d944647b25d5ad8ad3ca08586c499f894
treeaae4dff77730c65363e156e62fb7c01177334912
parentfbe221c704dc726f2bce70d3ad4c975b26176acb
parent386aa157bf3af3578fbb4f44f8924a553b6d729d
Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge

* stable/for-linus-3.6.rebased:
  xen/mce: schedule a workqueue to avoid sleep in atomic context
  xen/mce: Register native mce handler as vMCE bounce back point
  x86, MCE, AMD: Adjust initcall sequence for xen
  xen/mce: Add mcelog support for Xen platform

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