2 files changed, 17 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 86334b6f8238..9f73587219e8 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -336,3 +336,13 @@ When:	After the only user (hal) has seen a release with the patches
 Why:    Over 1K .text/.data size reduction, data is available in other
         ways (ioctls)
 Who:    Johannes Berg <johannes@sipsolutions.net>
+
+---------------------------
+
+What: CONFIG_NF_CT_ACCT
+When: 2.6.29
+Why:  Accounting can now be enabled/disabled without kernel recompilation.
+      Currently used only to set a default value for a feature that is also
+      controlled by a kernel/module/sysfs/sysctl parameter.
+Who:  Krzysztof Piotr Oledzki <ole@ans.pl>
+
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 09ad7450647b..e4ef27584408 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1279,6 +1279,13 @@ and is between 256 and 4096 characters. It is defined in the file
                         This usage is only documented in each driver source
                         file if at all.
 
+        nf_conntrack.acct=
+                        [NETFILTER] Enable connection tracking flow accounting
+                        0 to disable accounting
+                        1 to enable accounting
+                        Default value depends on CONFIG_NF_CT_ACCT that is
+                        going to be removed in 2.6.29.
+
         nfsaddrs=       [NFS]
                         See Documentation/filesystems/nfsroot.txt.