aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2018-09-21 13:59:04 +0200
committerMicael Karlberg <[email protected]>2018-09-21 13:59:04 +0200
commit2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1 (patch)
treee4783436ad8f87ba6f420c90a6e987df192010b2 /lib/kernel/test
parentceb5ac40d519cc475c6c3252a2e4f87cdcd5b6f0 (diff)
parent0474c879d44f3fe5696f8c867ffb283ccab43949 (diff)
downloadotp-2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1.tar.gz
otp-2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1.tar.bz2
otp-2b6aacdbb3f6b0ee23c400e2046ae8fe7f282ec1.zip
Merge branch 'bmk/20180918/nififying_inet_freebsd/OTP-14831' into bmk/20180918/nififying_inet/OTP-14831
Also needed to "revert" two of the chnages, related to assoc id. This is in FreeBSD defined as an uint32 but on linux as a int32.
Diffstat (limited to 'lib/kernel/test')
0 files changed, 0 insertions, 0 deletions