From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Nov 2014 23:26:48 +0000 (-0800)
Subject: Merge branch 'parisc-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.14-rc1~6477
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=555e5986bab6715ad6e39a35aeb67a218cc80abf;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'parisc-3.18-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller:
 "Changes include:
   - wire up the bpf syscall
   - remove CONFIG_64BIT usage from some userspace-exported header files
   - use compat functions for msgctl, shmat, shmctl and semtimedop
     syscalls"

* 'parisc-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Avoid using CONFIG_64BIT in userspace exported headers
  parisc: Use compat layer for msgctl, shmat, shmctl and semtimedop syscalls
  parisc: Use BUILD_BUG() instead of undefined functions
  parisc: Wire up bpf syscall
---

555e5986bab6715ad6e39a35aeb67a218cc80abf