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/cris | |
| 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/cris')
| -rw-r--r-- | arch/cris/arch-v32/lib/nand_init.S | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/etraxgpio.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/lib/nand_init.S b/arch/cris/arch-v32/lib/nand_init.S index e705f5cce969..d671fed451c9 100644 --- a/arch/cris/arch-v32/lib/nand_init.S +++ b/arch/cris/arch-v32/lib/nand_init.S | |||
| @@ -139,7 +139,7 @@ copy_nand_to_ram: | |||
| 139 | lsrq 8, $r4 | 139 | lsrq 8, $r4 |
| 140 | move.b $r4, [$r1] ; Row address | 140 | move.b $r4, [$r1] ; Row address |
| 141 | lsrq 8, $r4 | 141 | lsrq 8, $r4 |
| 142 | move.b $r4, [$r1] ; Row adddress | 142 | move.b $r4, [$r1] ; Row address |
| 143 | moveq 20, $r4 | 143 | moveq 20, $r4 |
| 144 | 2: bne 2b | 144 | 2: bne 2b |
| 145 | subq 1, $r4 | 145 | subq 1, $r4 |
diff --git a/arch/cris/include/asm/etraxgpio.h b/arch/cris/include/asm/etraxgpio.h index d474818a537e..461c089db765 100644 --- a/arch/cris/include/asm/etraxgpio.h +++ b/arch/cris/include/asm/etraxgpio.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * The following devices are accessable using this driver using | 2 | * The following devices are accessible using this driver using |
| 3 | * GPIO_MAJOR (120) and a couple of minor numbers. | 3 | * GPIO_MAJOR (120) and a couple of minor numbers. |
| 4 | * | 4 | * |
| 5 | * For ETRAX 100LX (CONFIG_ETRAX_ARCH_V10): | 5 | * For ETRAX 100LX (CONFIG_ETRAX_ARCH_V10): |