From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2015 01:13:07 +0000 (-0800)
Subject: Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
X-Git-Tag: v4.14-rc1~4241
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04527fdafe2e12ad2d89bfd0f0bb7fe481687976;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull ARM fixes from Russell King:
 "Just two changes this time around:

   - wire up the new mlock2 syscall added during the last merge window

   - fix a build problem with certain configurations provoked by making
     CONFIG_OF user selectable"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8454/1: OF implies OF_FLATTREE
  ARM: wire up mlock2 syscall
---

04527fdafe2e12ad2d89bfd0f0bb7fe481687976