From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Sep 2012 19:06:54 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.6-rc7~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ca7de91640a9840a0d29021d17492be7fd8232b;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git./linux/kernel/git/konrad/xen

Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
 - Fix M2P batching re-using the incorrect structure field.

   In v3.5 we added batching for M2P override (Machine Frame Number ->
   Physical Frame Number), but the original MFN was saved in an
   incorrect structure - and we would oops/restore when restoring with
   the old MFN.

 - Disable BIOS SMP MP table search.

   A bootup issue that we had ignored until we found that on DL380 G6 it
   was needed.

* tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/boot: Disable BIOS SMP MP table search.
  xen/m2p: do not reuse kmap_op->dev_bus_addr
---

8ca7de91640a9840a0d29021d17492be7fd8232b