diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-15 12:33:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-15 12:33:42 +1000 |
| commit | ca002c84304680d08891759589c5522ed5e088bc (patch) | |
| tree | 22c9a16e11167a15f007981bf4b208c61c906f14 /Documentation | |
| parent | 426efdf5b51a5495bcc9ae29afc51946a6eb2220 (diff) | |
| parent | 5c5daf571a59c88fd75b33105d068813d2f9d92c (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arm/SA1100/FreeBird | 4 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/arm/SA1100/FreeBird b/Documentation/arm/SA1100/FreeBird index fb23b770aaf4..ab9193663b2b 100644 --- a/Documentation/arm/SA1100/FreeBird +++ b/Documentation/arm/SA1100/FreeBird @@ -1,6 +1,6 @@ -Freebird-1.1 is produced by Legned(C) ,Inc. +Freebird-1.1 is produced by Legend(C), Inc. http://web.archive.org/web/*/http://www.legend.com.cn -and software/linux mainatined by Coventive(C),Inc. +and software/linux maintained by Coventive(C), Inc. (http://www.coventive.com) Based on the Nicolas's strongarm kernel tree. diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 6bd23751a2ce..ad93de87cc0a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1715,7 +1715,7 @@ and is between 256 and 4096 characters. It is defined in the file norandmaps Don't use address space randomization. Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space - noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops + noreplace-paravirt [X86,IA-64,PV_OPS] Don't patch paravirt_ops noreplace-smp [X86-32,SMP] Don't replace SMP instructions with UP alternatives |