diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-14 18:09:04 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-14 18:09:04 +0000 |
commit | 4f41964e046a17586c216f74f14bd97b3e5164c9 (patch) | |
tree | e0f206d1e5be4b526336c4037e74f08f1fda39ac /include/net/sctp/sctp.h | |
parent | 3251b2cdb9959eb46bd9b9fa9fb3c470eaf464b3 (diff) | |
parent | 11a266d2e5e6b73bfba337fb3ef21c8fd4fa4150 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'include/net/sctp/sctp.h')
0 files changed, 0 insertions, 0 deletions