aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.0_r26' into cm-13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Ricardo Cerqueira2015-11-050-0/+0
|\
| * extensions: libxt_socket: add --restore-skmark optionHarout Hedeshian2015-07-292-0/+79
| * Merge "xt_socket: add --nowildcard flag" into mnc-dr-devLorenzo Colitti2015-07-292-0/+69
| |\
| | * xt_socket: add --nowildcard flagEric Dumazet2015-07-292-0/+69
* | | extensions: libxt_socket: add --restore-skmark optionHarout Hedeshian2015-10-062-0/+79
* | | xt_socket: add --nowildcard flagEric Dumazet2015-10-062-0/+69
* | | extensions: add hard idletimer xt target extensionSusheel Yadagiri2015-10-063-0/+177
|/ /
* | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-240-0/+0
|\|
| * extensions: libxt_TEE: Trim kernel struct to allow deletionLoganaden Velvindron2015-03-191-2/+2
* | Merge "extensions: libxt_TEE: Trim kernel struct to allow deletion"Lorenzo 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."Dan Albert2014-12-081-1/+0
|\ \
| * | Clean up unused variable in makefile.Dan Albert2014-11-251-1/+0
|/ /
* | Merge "Add MODULE_LICENSE and NOTICE files"Conley 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 worksJP 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
| * | extensions: libxt_LOG: rename IPv4 manpage and tell about IPv6 supportMart Frauenlob2013-06-072-37/+3
| * | extensions: libxt_MASQUERADE: rename IPv4 manpage and tell about IPv6 supportMart Frauenlob2013-06-072-36/+4
| * | configure: display summaryEric Leblond2013-06-051-2/+47
| * | Merge branch 'stable'Pablo Neira Ayuso2013-05-301-2/+1
| |\|
| | * extensions: libxt_LED: fix parsing of delayPablo Neira Ayuso2013-05-301-2/+1
| * | xtables: improve get_modprobe handlingPhil Oester2013-05-291-11/+11
| * | iptables: use autoconf to process .in man pagesAndy Spencer2013-05-296-12/+8
| * | extensions: libxt_SNAT: rename IPv4 manpage and tell about IPv6 supportMart Frauenlob2013-05-291-8/+7