From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Oct 2015 18:51:46 +0000 (-0400)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Tag: firefly_0821_release~176^2~974
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b55a97e759c9e9efdce0470f520026383c514a13;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:
 "Summary:
   - Fix for accidental modification of arguments of syscall functions
   - Wire up new syscalls
   - Update defconfigs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.3-rc1
  m68k: Define asmlinkage_protect
  m68k: Wire up membarrier
  m68k: Wire up userfaultfd
  m68k: Wire up direct socket calls
---

b55a97e759c9e9efdce0470f520026383c514a13