Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2014 02:21:01 +0000 (11:21 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2014 02:21:01 +0000 (11:21 +0900)
commit619b5891903936f3e493bf8cda18a8b6664fcdd7
tree58472edc2ba7fc7319a139f7903913892cb7603f
parent19726630c69eb373d6d5d4f3934c2ed540914344
parent1f53ba6e81749a420226e5502c49ab83ba85c81d
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
arch/arm64/include/asm/memory.h