aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-01-20Merge remote-tracking branch 'remotes/lego/LA.BR.1.3.3_rb2.8' into staging_pushandroid-lego-6.0.1_r2android-lego-6.0.1_r1marshmallow-dr-lego-releaseChristian Bejram
2015-11-04Merge tag 'android-6.0.0_r26' into HEADDivya Sharma
2015-10-06extensions: libxt_socket: add --restore-skmark optionHarout Hedeshian
2015-10-06xt_socket: add --nowildcard flagEric Dumazet
2015-10-06extensions: add hard idletimer xt target extensionSusheel Yadagiri
2015-07-29extensions: libxt_socket: add --restore-skmark optionandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devlinaro-android-6.0Harout Hedeshian
2015-07-29Merge "xt_socket: add --nowildcard flag" into mnc-dr-devLorenzo Colitti
2015-07-29xt_socket: add --nowildcard flagEric Dumazet
2015-03-24Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-releasePrerepa Viswanadham
2015-03-19Merge "extensions: libxt_TEE: Trim kernel struct to allow deletion"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-previewmaster-soongLorenzo Colitti
2015-03-19extensions: libxt_TEE: Trim kernel struct to allow deletionandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaseLoganaden Velvindron
2015-03-19extensions: libxt_TEE: Trim kernel struct to allow deletionLoganaden Velvindron
2015-02-27Merge "Remove unused My_intermediates variable from iptables/Android.mk"Narayan Kamath
2015-02-27Remove unused My_intermediates variable from iptables/Android.mkTrevor Drake
2014-12-13Merge "Suppress clang warning on checking array address."Chih-Hung Hsieh
2014-12-09Suppress clang warning on checking array address.Chih-Hung Hsieh
2014-12-08Merge "Clean up unused variable in makefile."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert
2014-11-25Clean up unused variable in makefile.Dan Albert
2014-10-15Merge "Add MODULE_LICENSE and NOTICE files"android-l-preview_r2l-previewConley Owens
2014-10-10Add MODULE_LICENSE and NOTICE filesConley Owens
2014-04-02Fixup build so that the update from nefilter.org to 1.4.20 worksandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseidea133-weekly-releaseJP Abgrall
2014-04-02Merge remote-tracking branch 'upstream/stable-1.4.20' into updateJP Abgrall
2014-02-08Merge "Post-uapi cleanup."Elliott Hughes
2014-02-07Post-uapi cleanup.Elliott Hughes
2014-01-28Merge "external/iptables: use local-generated-sources-dir"Colin Cross
2014-01-28external/iptables: use local-generated-sources-dirColin Cross
2014-01-28Merge "Revert "external/iptables: use local-generated-sources-dir""Colin Cross
2014-01-28Revert "external/iptables: use local-generated-sources-dir"Colin Cross
2014-01-28Merge changes I78e78981,Idcbe1da8Colin Cross
2014-01-27external/iptables: use local-generated-sources-dirColin Cross
2014-01-24iptables: rewrite extensions makefile to avoid duplicationColin Cross
2014-01-23Merge "iptables: remove $(KERNEL_HEADERS) from include path"Colin Cross
2014-01-22iptables: remove $(KERNEL_HEADERS) from include pathColin Cross
2013-12-05Merge "Silence all warnings."idea133Kristian Monsen
2013-12-04Silence all warnings.Kristian Monsen
2013-11-12Merge "Fix iptables to build with old or uapi header files."Elliott Hughes
2013-11-11Fix iptables to build with old or uapi header files.Elliott Hughes
2013-08-23iptables: link against libnetfilter_conntrackJan Engelhardt
2013-08-12Merge "Include strings.h for the defintion of ffs()"tools_r22.2jp abgrall
2013-08-08iptables: state match incompatibilty across versionsPhil Oester
2013-08-08iptables: correctly reference generated fileLutz Jaenicke
2013-08-06iptables 1.4.20 releasePablo Neira Ayuso
2013-07-26iptables-xml: fix parameter parsing (similar to 2165f38)Pablo Neira Ayuso
2013-07-26iptables: iptables-xml: Fix various parsing bugsPhil Oester
2013-07-26build: fail in configure on missing dependency with --enable-bpf-compilerWillem de Bruijn
2013-07-24build: additional include path required after UAPI changesPhil Oester
2013-07-24libxt_CT: Add the "NOTRACK" aliasJozsef Kadlecsik
2013-07-24libip6t_LOG: target output is different to libipt_LOGPhil Oester
2013-07-24libxt_recent: restore minimum value for --secondsPablo Neira Ayuso
2013-07-16extensions: libxt_connlabel: use libnetfilter_conntrackFlorian Westphal