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 /Documentation/scsi | |
| 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 'Documentation/scsi')
| -rw-r--r-- | Documentation/scsi/ChangeLog.lpfc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc index 337c924cc81f..5e83769c6aa9 100644 --- a/Documentation/scsi/ChangeLog.lpfc +++ b/Documentation/scsi/ChangeLog.lpfc | |||
| @@ -573,7 +573,7 @@ Changes from 20041018 to 20041123 | |||
| 573 | * Backround nodev_timeout processing to DPC This enables us to | 573 | * Backround nodev_timeout processing to DPC This enables us to |
| 574 | unblock (stop dev_loss_tmo) when appopriate. | 574 | unblock (stop dev_loss_tmo) when appopriate. |
| 575 | * Fix array discovery with multiple luns. The max_luns was 0 at | 575 | * Fix array discovery with multiple luns. The max_luns was 0 at |
| 576 | the time the host structure was intialized. lpfc_cfg_params | 576 | the time the host structure was initialized. lpfc_cfg_params |
| 577 | then set the max_luns to the correct value afterwards. | 577 | then set the max_luns to the correct value afterwards. |
| 578 | * Remove unused define LPFC_MAX_LUN and set the default value of | 578 | * Remove unused define LPFC_MAX_LUN and set the default value of |
| 579 | lpfc_max_lun parameter to 512. | 579 | lpfc_max_lun parameter to 512. |