diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 12:36:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 12:36:28 -0400 |
| commit | 2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch) | |
| tree | 8ce40f811092844ea9da683804db6e2afa410808 /Documentation/development-process | |
| parent | 22e04f6b4b04a8afe9af9239224591d06ba3b24d (diff) | |
| parent | f8ea61e63442c25cbe6ddee48979b444f1f2a01c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"The usual trivial updates all over the tree -- mostly typo fixes and
documentation updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
doc: Documentation/cputopology.txt fix typo
treewide: Convert retrun typos to return
Fix comment typo for init_cma_reserved_pageblock
Documentation/trace: Correcting and extending tracepoint documentation
mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
power: Documentation: Update s2ram link
doc: fix a typo in Documentation/00-INDEX
Documentation/printk-formats.txt: No casts needed for u64/s64
doc: Fix typo "is is" in Documentations
treewide: Fix printks with 0x%#
zram: doc fixes
Documentation/kmemcheck: update kmemcheck documentation
doc: documentation/hwspinlock.txt fix typo
PM / Hibernate: add section for resume options
doc: filesystems : Fix typo in Documentations/filesystems
scsi/megaraid fixed several typos in comments
ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
page_isolation: Fix a comment typo in test_pages_isolated()
doc: fix a typo about irq affinity
...
Diffstat (limited to 'Documentation/development-process')
| -rw-r--r-- | Documentation/development-process/2.Process | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/development-process/2.Process b/Documentation/development-process/2.Process index 4823577c6509..2e0617936e8f 100644 --- a/Documentation/development-process/2.Process +++ b/Documentation/development-process/2.Process | |||
| @@ -276,7 +276,7 @@ mainline get there via -mm. | |||
| 276 | The current -mm patch is available in the "mmotm" (-mm of the moment) | 276 | The current -mm patch is available in the "mmotm" (-mm of the moment) |
| 277 | directory at: | 277 | directory at: |
| 278 | 278 | ||
| 279 | http://userweb.kernel.org/~akpm/mmotm/ | 279 | http://www.ozlabs.org/~akpm/mmotm/ |
| 280 | 280 | ||
| 281 | Use of the MMOTM tree is likely to be a frustrating experience, though; | 281 | Use of the MMOTM tree is likely to be a frustrating experience, though; |
| 282 | there is a definite chance that it will not even compile. | 282 | there is a definite chance that it will not even compile. |
| @@ -287,7 +287,7 @@ the mainline is expected to look like after the next merge window closes. | |||
| 287 | Linux-next trees are announced on the linux-kernel and linux-next mailing | 287 | Linux-next trees are announced on the linux-kernel and linux-next mailing |
| 288 | lists when they are assembled; they can be downloaded from: | 288 | lists when they are assembled; they can be downloaded from: |
| 289 | 289 | ||
| 290 | http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/ | 290 | http://www.kernel.org/pub/linux/kernel/next/ |
| 291 | 291 | ||
| 292 | Some information about linux-next has been gathered at: | 292 | Some information about linux-next has been gathered at: |
| 293 | 293 | ||