diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /Documentation/kernel-doc-nano-HOWTO.txt | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'Documentation/kernel-doc-nano-HOWTO.txt')
| -rw-r--r-- | Documentation/kernel-doc-nano-HOWTO.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt index c65233d430f0..284e7e198e93 100644 --- a/Documentation/kernel-doc-nano-HOWTO.txt +++ b/Documentation/kernel-doc-nano-HOWTO.txt | |||
| @@ -17,7 +17,7 @@ are: | |||
| 17 | special place-holders for where the extracted documentation should | 17 | special place-holders for where the extracted documentation should |
| 18 | go. | 18 | go. |
| 19 | 19 | ||
| 20 | - scripts/docproc.c | 20 | - scripts/basic/docproc.c |
| 21 | 21 | ||
| 22 | This is a program for converting SGML template files into SGML | 22 | This is a program for converting SGML template files into SGML |
| 23 | files. When a file is referenced it is searched for symbols | 23 | files. When a file is referenced it is searched for symbols |