diff options
-rw-r--r-- | Documentation/cris/README | 2 | ||||
-rw-r--r-- | Documentation/ia64/kvm.txt | 9 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_acct.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/cris/README b/Documentation/cris/README index 795a1dabe6c7..d9b086869a60 100644 --- a/Documentation/cris/README +++ b/Documentation/cris/README | |||
@@ -27,7 +27,7 @@ operating system. | |||
27 | The ETRAX 100LX chip | 27 | The ETRAX 100LX chip |
28 | -------------------- | 28 | -------------------- |
29 | 29 | ||
30 | For reference, plase see the press-release: | 30 | For reference, please see the press-release: |
31 | 31 | ||
32 | http://www.axis.com/news/us/001101_etrax.htm | 32 | http://www.axis.com/news/us/001101_etrax.htm |
33 | 33 | ||
diff --git a/Documentation/ia64/kvm.txt b/Documentation/ia64/kvm.txt index 914d07f49268..84f7cb3d5bec 100644 --- a/Documentation/ia64/kvm.txt +++ b/Documentation/ia64/kvm.txt | |||
@@ -1,7 +1,8 @@ | |||
1 | Currently, kvm module in EXPERIMENTAL stage on IA64. This means that | 1 | Currently, kvm module is in EXPERIMENTAL stage on IA64. This means that |
2 | interfaces are not stable enough to use. So, plase had better don't run | 2 | interfaces are not stable enough to use. So, please don't run critical |
3 | critical applications in virtual machine. We will try our best to make it | 3 | applications in virtual machine. |
4 | strong in future versions! | 4 | We will try our best to improve it in future versions! |
5 | |||
5 | Guide: How to boot up guests on kvm/ia64 | 6 | Guide: How to boot up guests on kvm/ia64 |
6 | 7 | ||
7 | This guide is to describe how to enable kvm support for IA-64 systems. | 8 | This guide is to describe how to enable kvm support for IA-64 systems. |
diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c index 03591d37b9cc..b92df5c1dfcf 100644 --- a/net/netfilter/nf_conntrack_acct.c +++ b/net/netfilter/nf_conntrack_acct.c | |||
@@ -115,7 +115,7 @@ int nf_conntrack_acct_init(struct net *net) | |||
115 | 115 | ||
116 | if (net_eq(net, &init_net)) { | 116 | if (net_eq(net, &init_net)) { |
117 | #ifdef CONFIG_NF_CT_ACCT | 117 | #ifdef CONFIG_NF_CT_ACCT |
118 | printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Plase use\n"); | 118 | printk(KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n"); |
119 | printk(KERN_WARNING "nf_conntrack.acct=1 kernel paramater, acct=1 nf_conntrack module option or\n"); | 119 | printk(KERN_WARNING "nf_conntrack.acct=1 kernel paramater, acct=1 nf_conntrack module option or\n"); |
120 | printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n"); | 120 | printk(KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n"); |
121 | #endif | 121 | #endif |