Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jul 2017 17:09:40 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jul 2017 17:09:40 +0000 (10:09 -0700)
Pull ARM fix from Russell King:
 "One final fix for 4.12 - Doug found a boot failure case triggered by
  requesting a non-even MB vmalloc size"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8685/1: ensure memblock-limit is pmd-aligned


Trivial merge