diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-15 15:26:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-15 15:26:48 -0800 |
| commit | 555e5986bab6715ad6e39a35aeb67a218cc80abf (patch) | |
| tree | 76527d0e133dd36cf2d4413f5aafa47ff608a57a /usr | |
| parent | ec7de6567ffdc8bdcf816365ef56bc0771afb63d (diff) | |
| parent | d8f5457ab93965f0e695516ad23548954e3e9044 (diff) | |
| download | linux-555e5986bab6715ad6e39a35aeb67a218cc80abf.tar.bz2 | |
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
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions