diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
commit | 9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch) | |
tree | 2f1b488b606bc03f8c5ce133f9158196fef07cd2 /kernel/kexec.c | |
parent | 4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff) | |
parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual earth-shaking, news-breaking, rocket science pile from
trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
doc: add missing files to timers/00-INDEX
timekeeping: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
irq: Fix some trivial typos in comments
NUMA: fix typos in Kconfig help text
mm: update 00-INDEX
doc: Documentation/DMA-attributes.txt fix typo
DRM: comment: `halve' -> `half'
Docs: Kconfig: `devlopers' -> `developers'
doc: typo on word accounting in kprobes.c in mutliple architectures
treewide: fix "usefull" typo
treewide: fix "distingush" typo
mm/Kconfig: Grammar s/an/a/
kexec: Typo s/the/then/
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
treewide: Fix common typo in "identify"
__page_to_pfn: Fix typo in comment
Correct some typos for word frequency
clk: fixed-factor: Fix a trivial typo
...
Diffstat (limited to 'kernel/kexec.c')
-rw-r--r-- | kernel/kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 2a74f307c5ec..490afc03627e 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -921,7 +921,7 @@ static int kimage_load_segment(struct kimage *image, | |||
921 | * reinitialize them. | 921 | * reinitialize them. |
922 | * | 922 | * |
923 | * - A machine specific part that includes the syscall number | 923 | * - A machine specific part that includes the syscall number |
924 | * and the copies the image to it's final destination. And | 924 | * and then copies the image to it's final destination. And |
925 | * jumps into the image at entry. | 925 | * jumps into the image at entry. |
926 | * | 926 | * |
927 | * kexec does not sync, or unmount filesystems so if you need | 927 | * kexec does not sync, or unmount filesystems so if you need |