diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:07:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:07:02 +0300 |
| commit | 684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91 (patch) | |
| tree | 47df6b59ab2f7d13516127726b99edc985bf4e12 /Documentation | |
| parent | 4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad (diff) | |
| parent | fd0587339d80dd2fea5ead7f734676c9c618eace (diff) | |
| download | linux-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.tar.gz linux-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.tar.bz2 linux-684baeb1d78ac478a8e5f00aa9ab0ce0837f2a91.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core kernel fixes from Ingo Molnar:
"Two small fixes"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Documentation: Reflect the new location of the NMI watchdog info
nohz: Fix idle ticks in cpu summary line of /proc/stat
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/00-INDEX | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index f54273e2ac97..ceb1ff735469 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -210,6 +210,8 @@ local_ops.txt - semantics and behavior of local atomic operations. lockdep-design.txt - documentation on the runtime locking correctness validator. +lockup-watchdogs.txt + - info on soft and hard lockup detectors (aka nmi_watchdog). logo.gif - full colour GIF image of Linux logo (penguin - Tux). logo.txt @@ -240,8 +242,6 @@ netlabel/ - directory with information on the NetLabel subsystem. networking/ - directory with info on various aspects of networking with Linux. -nmi_watchdog.txt - - info on NMI watchdog for SMP systems. nommu-mmap.txt - documentation about no-mmu memory mapping support. numastat.txt |