]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 5 Dec 2012 16:04:26 +0000 (11:04 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 5 Dec 2012 16:04:26 +0000 (11:04 -0500)
commit9f746b40d81442a31e34f296d6527363b3522863
treedd15ea1f9a0994074cf3f3aa1bfda1165b572636
parenta3420cd6b5efa4bfaa01e96a83afed8ba468debe
parentc9d20be496591484b8241f9c3b2fef491509a0bf
Merge branch 'stable/for-linus-3.7.rebased' into uek2-merge

* stable/for-linus-3.7.rebased:
  Revert "xen/x86: Workaround 64-bit hypervisor and 32-bit initial domain." and "xen/x86: Use memblock_reserve for sensitive areas."
  xen/x86: Workaround 64-bit hypervisor and 32-bit initial domain.
arch/x86/xen/enlighten.c
arch/x86/xen/p2m.c
arch/x86/xen/setup.c