From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Sep 2014 00:45:27 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~176^2~3239
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc486b03cae382601b366ab460b05e1a01bf69cd;p=firefly-linux-kernel-4.4.55.git

Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git./linux/kernel/git/xen/tip

Pull Xen ARM bugfix from Stefano Stabellini:
 "The patches fix the "xen_add_mach_to_phys_entry: cannot add" bug that
  has been affecting xen on arm and arm64 guests since 3.16.  They
  require a few hypervisor side changes that just went in xen-unstable.

  A couple of days ago David sent out a pull request with a few other
  Xen fixes (it is already in master).  Sorry we didn't synchronized
  better among us"

* tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/arm: remove mach_to_phys rbtree
  xen/arm: reimplement xen_dma_unmap_page & friends
  xen/arm: introduce XENFEAT_grant_map_identity
---

fc486b03cae382601b366ab460b05e1a01bf69cd