From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Dec 2015 18:34:20 +0000 (-0800)
Subject: Merge branch 'parisc-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: submit/tizen/20160607.132125~1259
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a971526e4db7992362e938e53e2deb57e847ecc9;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'parisc-4.4-3' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "Fix the boot crash on Mako machines with Huge Pages, prevent a panic
  with SATA controllers (and others) by correctly calculating the IOMMU
  space, hook up the mlock2 syscall and drop unneeded code in the parisc
  pci code"

* 'parisc-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Disable huge pages on Mako machines
  parisc: Wire up mlock2 syscall
  parisc: Remove unused pcibios_init_bus()
  parisc iommu: fix panic due to trying to allocate too large region
---

a971526e4db7992362e938e53e2deb57e847ecc9