diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
| commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
| tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /arch/m68k | |
| parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
| parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/ifpsp060/src/fpsp.S | 2 | ||||
| -rw-r--r-- | arch/m68k/mac/psc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S index 73613b5f1ee5..26e85e2b7a5e 100644 --- a/arch/m68k/ifpsp060/src/fpsp.S +++ b/arch/m68k/ifpsp060/src/fpsp.S | |||
| @@ -3881,7 +3881,7 @@ _fpsp_fline: | |||
| 3881 | # FP Unimplemented Instruction stack frame and jump to that entry | 3881 | # FP Unimplemented Instruction stack frame and jump to that entry |
| 3882 | # point. | 3882 | # point. |
| 3883 | # | 3883 | # |
| 3884 | # but, if the FPU is disabled, then we need to jump to the FPU diabled | 3884 | # but, if the FPU is disabled, then we need to jump to the FPU disabled |
| 3885 | # entry point. | 3885 | # entry point. |
| 3886 | movc %pcr,%d0 | 3886 | movc %pcr,%d0 |
| 3887 | btst &0x1,%d0 | 3887 | btst &0x1,%d0 |
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index ba6ccab64018..a4c3eb60706e 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c | |||
| @@ -88,7 +88,7 @@ void __init psc_init(void) | |||
| 88 | 88 | ||
| 89 | /* | 89 | /* |
| 90 | * The PSC is always at the same spot, but using psc | 90 | * The PSC is always at the same spot, but using psc |
| 91 | * keeps things consisant with the psc_xxxx functions. | 91 | * keeps things consistent with the psc_xxxx functions. |
| 92 | */ | 92 | */ |
| 93 | 93 | ||
| 94 | psc = (void *) PSC_BASE; | 94 | psc = (void *) PSC_BASE; |