From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Dec 2013 18:12:01 +0000 (-0800)
Subject: Merge tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bcc2f9b718d0be9cd77551d37c28daf4ebbc570c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'stable/for-linus-3.13-rc2-tag' of git://git./linux/kernel/git/xen/tip

Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
 "Fixes to patches that went in this merge window along with a latent
  bug:
   - Fix lazy flushing in case m2p override fails.
   - Fix module compile issues with ARM/Xen
   - Add missing call to DMA map page for Xen SWIOTLB for ARM"

* tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
  xen/arm: p2m_init and p2m_lock should be static
  arm/xen: Export phys_to_mach to fix Xen module link errors
  swiotlb-xen: add missing xen_dma_map_page call
---

bcc2f9b718d0be9cd77551d37c28daf4ebbc570c