tree 76527d0e133dd36cf2d4413f5aafa47ff608a57a
parent ec7de6567ffdc8bdcf816365ef56bc0771afb63d
parent d8f5457ab93965f0e695516ad23548954e3e9044
author Linus Torvalds <torvalds@linux-foundation.org> 1416094008 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1416094008 -0800

Merge branch 'parisc-3.18-2' of git://git.kernel.org/pub/scm/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