diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 02:22:50 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 02:22:50 (GMT) |
| commit | e8650a08232e75274304b812ff04cfce9af9671c (patch) | |
| tree | 0609c942e6ca99016e788ff2ee2bbed1bb9215a4 /arch/m68k | |
| parent | 3c2c4b73aa79e4a1b601710b59e092441175f4bb (diff) | |
| parent | f70d4a95edc7da87f39cd8b603ba131df2c198ed (diff) | |
| download | linux-e8650a08232e75274304b812ff04cfce9af9671c.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
edac, mips: don't change code that has been removed in edac/mips tree
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
lib: Change mail address of Oskar Schirmer
net: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
i2c: Change mail address of Oskar Schirmer
net: Fix tcp_build_and_update_options comment in struct tcp_sock
atomic64_32.h: fix parameter naming mismatch
Kconfig: replace "--- help ---" with "---help---"
c2port: fix bogus Kconfig "default no"
edac: Fix spelling errors.
qla1280: Remove redundant NULL check before release_firmware() call
remoteproc: remove redundant NULL check before release_firmware()
qla2xxx: Remove redundant NULL check before release_firmware() call.
aic94xx: Get rid of redundant NULL check before release_firmware() call
tehuti: delete redundant NULL check before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
bna: remove redundant NULL test before release_firmware()
tg3: remove redundant NULL test before release_firmware() call
typhoon: get rid of redundant conditional before all to release_firmware()
...
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/Kconfig.cpu | 2 | ||||
| -rw-r--r-- | arch/m68k/platform/coldfire/m532x.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 8a9c767..51b3274 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -7,7 +7,7 @@ choice help The Freescale (was Motorola) M68K family of processors implements the full 68000 processor instruction set. - The Freescale ColdFire family of processors is a modern derivitive + The Freescale ColdFire family of processors is a modern derivative of the 68000 processor family. They are mainly targeted at embedded applications, and are all System-On-Chip (SOC) devices, as opposed to stand alone CPUs. They implement a subset of the original 68000 diff --git a/arch/m68k/platform/coldfire/m532x.c b/arch/m68k/platform/coldfire/m532x.c index 8e9476d..53942236 100644 --- a/arch/m68k/platform/coldfire/m532x.c +++ b/arch/m68k/platform/coldfire/m532x.c @@ -7,7 +7,7 @@ * Copyright (C) 2000, Lineo (www.lineo.com) * Yaroslav Vinogradov yaroslav.vinogradov@freescale.com * Copyright Freescale Semiconductor, Inc 2006 - * Copyright (c) 2006, emlix, Sebastian Hess <sh@emlix.com> + * Copyright (c) 2006, emlix, Sebastian Hess <shess@hessware.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |