diff options
author | David S. Miller <davem@davemloft.net> | 2010-07-03 01:42:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-03 01:42:06 -0400 |
commit | e490c1defec4236a6a131fe2d13bf7ba787c02f8 (patch) | |
tree | 132325ca88cc86a74345a93b2774c5ca284b038a /Documentation | |
parent | 0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba (diff) | |
parent | 4df53d8bab65cf2c18daebd51a5a4847e03f1943 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 9 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 672be0109d02..92f021aac92c 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -303,15 +303,6 @@ Who: Johannes Berg <johannes@sipsolutions.net> | |||
303 | 303 | ||
304 | --------------------------- | 304 | --------------------------- |
305 | 305 | ||
306 | What: CONFIG_NF_CT_ACCT | ||
307 | When: 2.6.29 | ||
308 | Why: Accounting can now be enabled/disabled without kernel recompilation. | ||
309 | Currently used only to set a default value for a feature that is also | ||
310 | controlled by a kernel/module/sysfs/sysctl parameter. | ||
311 | Who: Krzysztof Piotr Oledzki <ole@ans.pl> | ||
312 | |||
313 | --------------------------- | ||
314 | |||
315 | What: sysfs ui for changing p4-clockmod parameters | 306 | What: sysfs ui for changing p4-clockmod parameters |
316 | When: September 2009 | 307 | When: September 2009 |
317 | Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and | 308 | Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 1808f1157f30..cee62515ffa1 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1597,8 +1597,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1597 | [NETFILTER] Enable connection tracking flow accounting | 1597 | [NETFILTER] Enable connection tracking flow accounting |
1598 | 0 to disable accounting | 1598 | 0 to disable accounting |
1599 | 1 to enable accounting | 1599 | 1 to enable accounting |
1600 | Default value depends on CONFIG_NF_CT_ACCT that is | 1600 | Default value is 0. |
1601 | going to be removed in 2.6.29. | ||
1602 | 1601 | ||
1603 | nfsaddrs= [NFS] | 1602 | nfsaddrs= [NFS] |
1604 | See Documentation/filesystems/nfs/nfsroot.txt. | 1603 | See Documentation/filesystems/nfs/nfsroot.txt. |