diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-22 19:52:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-22 19:52:14 +0100 |
commit | fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5 (patch) | |
tree | 8148b2195ee0d487d1d7b8c8d2f4b65b0e597eb6 /net/sctp/socket.c | |
parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | nios2: fix kuser trampoline address (diff) | |
download | linux-fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5.tar.xz linux-fcb237317f225f5bae1ab72a42f1f5a9c57ba3d5.zip |
Merge tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next
Pull one arch/nios2 fix from Ley Foon Tan:
"Fix kuser trampoline address"
* tag 'nios2-fixes-v3.19-rc6' of git://git.rocketboards.org/linux-socfpga-next:
nios2: fix kuser trampoline address
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions