]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: da40d01 c1ebac5)
Merge branch 'stable/not-upstreamed' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 11 May 2012 20:37:46 +0000 (16:37 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 11 May 2012 20:37:46 +0000 (16:37 -0400)
commit725c152c1dfd89bb1cf9ebd5f46aab9efcbb57ce
tree7b0eefca6fcb6111ac4ea9aa61158a9c1d580d34tree
parentda40d0112c50e84c8b0513a6e4d471cbe2b016ebcommit | diff
parentc1ebac59b935bee8c3ab14de60ba755bc7f9a2becommit | diff
Merge branch 'stable/not-upstreamed' into uek2-merge

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

Conflicts:
drivers/xen/Makefile
arch/x86/xen/enlighten.c diff1 | diff2 | blob | history
drivers/xen/Kconfig diff1 | diff2 | blob | history
drivers/xen/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.