aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devYusuke Sato2015-08-262-6/+30
|\
| * Merge "Add '-w' option to ip[6]tables-restore"Yusuke Sato2015-08-262-6/+30
| |\
| | * Add '-w' option to ip[6]tables-restoreYusuke Sato2015-08-212-6/+30
| |/
* | am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin"Yusuke Sato2015-08-191-0/+8
|\|
| * Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin"Yusuke Sato2015-08-191-0/+8
| |\
| | * Add ip[6]tables-restore and ip[6]tables-save to /system/binYusuke Sato2015-08-181-0/+8
| |/
* | am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted"Dan Willemsen2015-08-121-3/+3
|\|
| * Merge "build: wildcard isn't guaranteed to be sorted"android-m-preview-2Dan Willemsen2015-08-121-3/+3
| |\
| | * build: wildcard isn't guaranteed to be sortedDan Willemsen2015-08-061-3/+3
| |/
* | am 53b5e80f: Merge "extensions: libxt_socket: add --restore-skmark option"Lorenzo Colitti2015-08-122-0/+79
|\|
| * Merge "extensions: libxt_socket: add --restore-skmark option"Lorenzo Colitti2015-07-202-0/+79
| |\
| | * extensions: libxt_socket: add --restore-skmark optionHarout Hedeshian2015-07-212-0/+79
| |/
* | am 9bc8d9b4: Merge "xt_socket: add --nowildcard flag"Lorenzo Colitti2015-06-122-0/+69
|\|
| * Merge "xt_socket: add --nowildcard flag"android-m-preview-1Lorenzo Colitti2015-06-122-0/+69
| |\
| | * xt_socket: add --nowildcard flagEric Dumazet2015-06-112-0/+69
| |/
* | Merge 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 Viswanadham2015-03-240-0/+0
|\ \ | |/ |/|
| * extensions: 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 Velvindron2015-03-191-2/+2
* | Merge "extensions: libxt_TEE: Trim kernel struct to allow deletion"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-previewmaster-soongLorenzo Colitti2015-03-191-2/+2
|\ \
| * | extensions: libxt_TEE: Trim kernel struct to allow deletionLoganaden Velvindron2015-03-191-2/+2
|/ /
* | Merge "Remove unused My_intermediates variable from iptables/Android.mk"Narayan Kamath2015-02-271-1/+0
|\ \
| * | Remove unused My_intermediates variable from iptables/Android.mkTrevor Drake2015-02-271-1/+0
|/ /
* | Merge "Suppress clang warning on checking array address."Chih-Hung Hsieh2014-12-131-1/+5
|\ \
| * | Suppress clang warning on checking array address.Chih-Hung Hsieh2014-12-091-1/+5
|/ /
* | Merge "Clean up unused variable in makefile."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert2014-12-081-1/+0
|\ \
| * | Clean up unused variable in makefile.Dan Albert2014-11-251-1/+0
|/ /
* | Merge "Add MODULE_LICENSE and NOTICE files"android-l-preview_r2l-previewConley Owens2014-10-152-0/+339
|\ \ | |/ |/|
| * Add MODULE_LICENSE and NOTICE filesConley Owens2014-10-102-0/+339
|/
* Fixup 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 Abgrall2014-04-029-31/+131
* Merge remote-tracking branch 'upstream/stable-1.4.20' into updateJP Abgrall2014-04-02209-3119/+6916
|\
| * iptables: link against libnetfilter_conntrackJan Engelhardt2013-08-232-6/+4
| * iptables: state match incompatibilty across versionsPhil Oester2013-08-081-0/+6
| * iptables: correctly reference generated fileLutz Jaenicke2013-08-081-1/+1
| * iptables 1.4.20 releasePablo Neira Ayuso2013-08-061-1/+1
| * iptables-xml: fix parameter parsing (similar to 2165f38)Pablo Neira Ayuso2013-07-261-1/+1
| * iptables: iptables-xml: Fix various parsing bugsPhil Oester2013-07-261-6/+13
| * build: fail in configure on missing dependency with --enable-bpf-compilerWillem de Bruijn2013-07-261-0/+4
| * build: additional include path required after UAPI changesPhil Oester2013-07-241-2/+2
| * libxt_CT: Add the "NOTRACK" aliasJozsef Kadlecsik2013-07-243-3/+54
| * libip6t_LOG: target output is different to libipt_LOGPhil Oester2013-07-241-2/+4
| * libxt_recent: restore minimum value for --secondsPablo Neira Ayuso2013-07-241-1/+1
| * extensions: libxt_connlabel: use libnetfilter_conntrackFlorian Westphal2013-07-166-127/+45
| * extensions: libipt_ULOG: man page should mention NFLOG as replacementFlorian Westphal2013-07-151-1/+2
| * libxt_recent: restore reap functionality to recent moduleRussell Senior2013-07-151-0/+2
| * ip{6}tables-restore: fix breakage due to new locking approachPablo Neira Ayuso2013-07-088-10/+22
| * ip6tables: don't print out /128Phil Oester2013-07-081-1/+5
| * doc: clarify DEBUG usage macroAlexey Perevalov2013-07-081-0/+2
| * Merge branch 'stable'Pablo Neira Ayuso2013-06-121-2/+2
| |\
| | * iptables: Fix connlabel.conf install locationPhil Oester2013-06-121-2/+2
| * | ip[6]tables: Add locking to prevent concurrent instancesPhil Oester2013-06-116-2/+81
| * | Introduce a new revision for the set match with the counters supportJozsef Kadlecsik2013-06-074-12/+312
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 13:11:08 +0000