diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /Documentation/kernel-parameters.txt | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 9347f4ad4342..3fe614d405e0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1725,8 +1725,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1725 | oprofile.cpu_type= Force an oprofile cpu type | 1725 | oprofile.cpu_type= Force an oprofile cpu type |
| 1726 | This might be useful if you have an older oprofile | 1726 | This might be useful if you have an older oprofile |
| 1727 | userland or if you want common events. | 1727 | userland or if you want common events. |
| 1728 | Format: { archperfmon } | 1728 | Format: { arch_perfmon } |
| 1729 | archperfmon: [X86] Force use of architectural | 1729 | arch_perfmon: [X86] Force use of architectural |
| 1730 | perfmon on Intel CPUs instead of the | 1730 | perfmon on Intel CPUs instead of the |
| 1731 | CPU specific event set. | 1731 | CPU specific event set. |
| 1732 | 1732 | ||