From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 May 2014 02:21:01 +0000 (+0900)
Subject: Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: accepted/tizen/common/20141203.182822~94^2~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=619b5891903936f3e493bf8cda18a8b6664fcdd7;p=platform%2Fkernel%2Flinux-arm64.git

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

Pull xen bug fixes from David Vrabel:
 - Fix arm64 crash on boot.
 - Quiet a noisy arm build warning (virt_to_pfn() redefined).

* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  arm64: introduce virt_to_pfn
  xen/events/fifo: correctly align bitops
  arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
---

619b5891903936f3e493bf8cda18a8b6664fcdd7