aboutsummaryrefslogtreecommitdiff
path: root/include/net/sctp/structs.h
diff options
context:
space:
mode:
authorMark Brown2017-02-19 16:41:05 +0000
committerMark Brown2017-02-19 16:41:05 +0000
commite2a3b0df8dea7585a2e64861f3ab7bcbc2a04386 (patch)
treecfdf1b8977a8f04177624c02d850132492b81f0b /include/net/sctp/structs.h
parent2016d52a381c8cfc4e126d96817eb49a30abae37 (diff)
parent23e291c2e4c84a40a4b3de8539dec95bfda214f1 (diff)
parentffcfae3823751c72b615b57f700e563667002d09 (diff)
parent72bc7ae0633e2b580217d254114ac6650380b7f6 (diff)
parente7ad4a73364c21f40963a35631b285b60fa3198c (diff)
parentc2e51ac3d0542440d5b2b8b52ff2ad00751af4da (diff)
Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic/s3c64xx', 'spi/topic/sh-msiof' and 'spi/topic/slave' into spi-next