diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-01 18:30:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-01 18:30:07 -0700 |
| commit | 204fe0380b14557a3179cf18f1101d4ed6532172 (patch) | |
| tree | 0315539c2605b85eb5e99fcca5a49fb78215db66 /include/net/esp.h | |
| parent | 568180a517aee88a8afdc9938f6884e047a2613f (diff) | |
| parent | 8212f58a9b151d842fa60a70f354e43c61fad839 (diff) | |
| download | linux-204fe0380b14557a3179cf18f1101d4ed6532172.tar.gz linux-204fe0380b14557a3179cf18f1101d4ed6532172.tar.bz2 linux-204fe0380b14557a3179cf18f1101d4ed6532172.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fix from Ben Herrenschmidt:
"Here's just one trivial patch to wire up sys_renameat2 which I seem to
have completely missed so far.
(My test build scripts fwd me warnings but miss the ones generated for
missing syscalls)"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Wire renameat2() syscall
Diffstat (limited to 'include/net/esp.h')
0 files changed, 0 insertions, 0 deletions