|author||Jan Engelhardt <email@example.com>||2012-09-30 23:34:04 +0200|
|committer||Jan Engelhardt <firstname.lastname@example.org>||2012-09-30 23:38:58 +0200|
Merge branch 'master' of git://git.inai.de/iptables
Conflicts: extensions/GNUmakefile.in Resolution: trivial, since this was a fuzz 3. Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes from v1.4.15-22-g4496801.
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions