diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:39:08 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:39:08 +0900 |
| commit | 23218843d92b77c99375609eb43e6e6b3d7f68c3 (patch) | |
| tree | 7c919d116bfacb3846fc42ba7900f7a2255041e1 /arch/m68k/coldfire/head.S | |
| parent | 7825e0c42943e16535ece82f3787b6b94a6c1652 (diff) | |
| parent | 6bd80f372371a7b3f5ff13e4e8a560066299c001 (diff) | |
Merge tag 'm68k-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k upddates from Geert Uytterhoeven:
- assorted spelling fixes
- defconfig updates
* tag 'm68k-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/defconfig: Update defconfigs for v4.7-rc2
m68k: Assorted spelling fixes
Diffstat (limited to 'arch/m68k/coldfire/head.S')
| -rw-r--r-- | arch/m68k/coldfire/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/head.S b/arch/m68k/coldfire/head.S index fa31be297b85..73d92ea0ce65 100644 --- a/arch/m68k/coldfire/head.S +++ b/arch/m68k/coldfire/head.S @@ -288,7 +288,7 @@ _clear_bss: #endif /* - * Assember start up done, start code proper. + * Assembler start up done, start code proper. */ jsr start_kernel /* start Linux kernel */ |