diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-13 02:02:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-13 02:02:06 +0300 |
| commit | 6c9d370c16aad97cfc6de68666634eaabac2b048 (patch) | |
| tree | 7af08f77133d5e6329f851514f5758651432d812 /net/ipv4/tcp_fastopen.c | |
| parent | 03906ca389211e167e0d8e9e5ec330e9be467936 (diff) | |
| parent | 620b155034570f577470cf5309f741bac6a6e32b (diff) | |
| download | linux-6c9d370c16aad97cfc6de68666634eaabac2b048.tar.xz | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"One build fix for build breakage of all MIPS SMP kernels caused by
Rusty's fix of obsolete use of cpu mask helpers, another to fix the FP
ABI selection when loading an ELF binary"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: fix FP mode selection in lieu of .MIPS.abiflags data
MIPS: SMP: Fix build error.
Diffstat (limited to 'net/ipv4/tcp_fastopen.c')
0 files changed, 0 insertions, 0 deletions