From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Sep 2012 00:16:42 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.6-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.6-rc5~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bf71d0e18ea94adade8c6cd5bd40beb83bef1565;hp=-c;p=uclinux-h8%2Flinux.git

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

Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
 * Fix for TLB flushing introduced in v3.6
 * Fix Xen-SWIOTLB not using proper DMA mask - device had 64bit but
   in a 32-bit kernel we need to allocate for coherent pages from a
   32-bit pool.
 * When trying to re-use P2M nodes we had a one-off error and triggered
   a BUG_ON check with specific CONFIG_ option.
 * When doing FLR in Xen-PCI-backend we would first do FLR then save the
   PCI configuration space. We needed to do it the other way around.

* tag 'stable/for-linus-3.6-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pciback: Fix proper FLR steps.
  xen: Use correct masking in xen_swiotlb_alloc_coherent.
  xen: fix logical error in tlb flushing
  xen/p2m: Fix one-off error in checking the P2M tree directory.
---

bf71d0e18ea94adade8c6cd5bd40beb83bef1565