diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
| commit | 59e52534172d845ebffb0d7e85fc56fb7b857051 (patch) | |
| tree | 49552e03f1bdb413cd8b5f7542e91770688d7047 /Documentation/kernel-docs.txt | |
| parent | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff) | |
| parent | 0d89e54c8249645404283436d952afc261a04e1e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
...
Diffstat (limited to 'Documentation/kernel-docs.txt')
| -rw-r--r-- | Documentation/kernel-docs.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt index 0e0734b509d8..eda1eb1451a0 100644 --- a/Documentation/kernel-docs.txt +++ b/Documentation/kernel-docs.txt | |||
| @@ -300,7 +300,7 @@ | |||
| 300 | 300 | ||
| 301 | * Title: "The Kernel Hacking HOWTO" | 301 | * Title: "The Kernel Hacking HOWTO" |
| 302 | Author: Various Talented People, and Rusty. | 302 | Author: Various Talented People, and Rusty. |
| 303 | Location: in kernel tree, Documentation/DocBook/kernel-hacking/ | 303 | Location: in kernel tree, Documentation/DocBook/kernel-hacking.tmpl |
| 304 | (must be built as "make {htmldocs | psdocs | pdfdocs}) | 304 | (must be built as "make {htmldocs | psdocs | pdfdocs}) |
| 305 | Keywords: HOWTO, kernel contexts, deadlock, locking, modules, | 305 | Keywords: HOWTO, kernel contexts, deadlock, locking, modules, |
| 306 | symbols, return conventions. | 306 | symbols, return conventions. |
| @@ -351,7 +351,7 @@ | |||
| 351 | 351 | ||
| 352 | * Title: "Linux Kernel Locking HOWTO" | 352 | * Title: "Linux Kernel Locking HOWTO" |
| 353 | Author: Various Talented People, and Rusty. | 353 | Author: Various Talented People, and Rusty. |
| 354 | Location: in kernel tree, Documentation/DocBook/kernel-locking/ | 354 | Location: in kernel tree, Documentation/DocBook/kernel-locking.tmpl |
| 355 | (must be built as "make {htmldocs | psdocs | pdfdocs}) | 355 | (must be built as "make {htmldocs | psdocs | pdfdocs}) |
| 356 | Keywords: locks, locking, spinlock, semaphore, atomic, race | 356 | Keywords: locks, locking, spinlock, semaphore, atomic, race |
| 357 | condition, bottom halves, tasklets, softirqs. | 357 | condition, bottom halves, tasklets, softirqs. |