tree e3c98a687783c5fbe9862646f455435fb6bfe3f8
parent be67d60ba944bdd38571b79bdcd506e34c0f16c1
parent 117e5e9c4cfcb7628f08de074fbfefec1bb678b7
author Linus Torvalds <torvalds@linux-foundation.org> 1475446980 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1475446980 -0700

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Three relatively small fixes for ARM:

   - Roger noticed that dma_max_pfn() was calculating the upper limit
     wrongly, by adding the PFN offset of memory twice.

   - A fix from Robin to correct parsing of MPIDR values when the
     address size is larger than one BE32 unit.

   - A fix from Srinivas to ensure that we do not rely on the boot
     loader (or previous Linux kernel) setting the translation table
     base register a certain way in the decompressor, which can lead to
     crashes"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8618/1: decompressor: reset ttbcr fields to use TTBR0 on ARMv7
  ARM: 8617/1: dma: fix dma_max_pfn()
  ARM: 8616/1: dt: Respect property size when parsing CPUs