Linus Torvalds 008d23e485 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.

2011-01-13 10:05:56 -08:00

..

lpfc_attr.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

lpfc_bsg.c

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_bsg.h

[SCSI] lpfc 8.3.12: BSG Fixes and enhancements

2010-04-11 13:45:38 -05:00

lpfc_compat.h

[SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup

2010-08-06 12:09:24 -05:00

lpfc_crtn.h

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_ct.c

[SCSI] lpfc 8.3.19: Add SLI4 FC Discovery support

2010-12-21 12:23:59 -06:00

lpfc_debugfs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

lpfc_debugfs.h

[SCSI] lpfc 8.3.0 : Hook lpfc's debugfs into Kconfig

2008-12-29 11:24:28 -06:00

lpfc_disc.h

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_els.c

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_hbadisc.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

lpfc_hw4.h

[SCSI] lpfc 8.3.20: Implement new SLI4 init procedures based on if_type

2010-12-21 12:37:23 -06:00

lpfc_hw.h

[SCSI] lpfc 8.3.19: Added support for ELS RRQ command

2010-12-21 12:24:01 -06:00

lpfc_init.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

lpfc_logmsg.h

[SCSI] lpfc 8.3.19: Fix critical errors and crashes

2010-12-21 12:23:58 -06:00

lpfc_mbox.c

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_mem.c

[SCSI] lpfc 8.3.19: Added support for ELS RRQ command

2010-12-21 12:24:01 -06:00

lpfc_nl.h

[SCSI] lpfc 8.3.8: (BSG1) Update BSG infrastructure

2010-02-08 18:39:02 -06:00

lpfc_nportdisc.c

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_scsi.c

[SCSI] lpfc 8.3.19: Added support for ELS RRQ command

2010-12-21 12:24:01 -06:00

lpfc_scsi.h

[SCSI] lpfc 8.3.8: BugFixes: SLI relates changes

2010-02-08 18:37:53 -06:00

lpfc_sli4.h

[SCSI] lpfc 8.3.20: Updates to FC discovery commands

2010-12-21 12:37:24 -06:00

lpfc_sli.c

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

lpfc_sli.h

[SCSI] lpfc 8.3.20: Implement the FC and SLI async event handlers

2010-12-21 12:37:20 -06:00

lpfc_version.h

[SCSI] lpfc 8.3.20: Update lpfc driver version to 8.3.20

2010-12-21 12:37:25 -06:00

lpfc_vport.c

[SCSI] lpfc 8.3.19: Add SLI4 FC Discovery support

2010-12-21 12:23:59 -06:00

lpfc_vport.h

[SCSI] lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events

2008-10-13 09:28:57 -04:00

lpfc.h

[SCSI] lpfc 8.3.19: Added support for ELS RRQ command

2010-12-21 12:24:01 -06:00

Makefile

[SCSI] lpfc 8.3.4: Add bsg (SGIOv4) support for ELS/CT support

2009-08-22 17:51:59 -05:00