]> 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>
Wed, 19 Sep 2012 15:02:41 +0000 (11:02 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 19 Sep 2012 15:02:41 +0000 (11:02 -0400)
commitf5463f8038384eeb7401c896e47d25cb87178cc7
treea81ed7130210226d404e7244effdb464b2d49afd
parent017ed0d6f8c0b98342a7cb66a7cb821e8f4dd6df
parent0fdbaaff4962294cc7ebe1113581fccc42316f2c
Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge

* stable/for-linus-3.6.rebased:
  xen/boot: Disable BIOS SMP MP table search.
  xen/m2p: do not reuse kmap_op->dev_bus_addr
  xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.

Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/enlighten.c
arch/x86/xen/p2m.c
arch/x86/xen/setup.c
drivers/block/xen-blkback/blkback.c
drivers/xen/gntdev.c