summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-16 06:08:53 +0100
committerDavid S. Miller <davem@davemloft.net>2009-12-16 06:08:53 +0100
commit81e839efc22361e3fa7ee36f99fd57c57d0d1871 (patch)
treeeac3550c8773ff0e6ccb91c280b930efc50b0e42 /Documentation
parenttcp: Revert per-route SACK/DSACK/TIMESTAMP changes. (diff)
parentipvs: zero usvc and udest (diff)
downloadlinux-81e839efc22361e3fa7ee36f99fd57c57d0d1871.tar.xz
linux-81e839efc22361e3fa7ee36f99fd57c57d0d1871.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Changes2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 6d0f1efc5bf6..f08b313cd235 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -49,6 +49,8 @@ o oprofile 0.9 # oprofiled --version
o udev 081 # udevinfo -V
o grub 0.93 # grub --version
o mcelog 0.6
+o iptables 1.4.1 # iptables -V
+
Kernel compilation
==================