linux/drivers/scsi/lpfc
Linus Torvalds 229aebb873 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: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
lpfc.h
lpfc_attr.c [SCSI] lpfc 8.3.17: SLI Additions and Fixes 2010-10-07 17:28:37 -05:00
lpfc_bsg.c [SCSI] lpfc 8.3.17: BSG fixes 2010-10-07 17:29:54 -05:00
lpfc_bsg.h
lpfc_compat.h
lpfc_crtn.h
lpfc_ct.c
lpfc_debugfs.c
lpfc_debugfs.h
lpfc_disc.h
lpfc_els.c [SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes 2010-10-07 17:26:19 -05:00
lpfc_hbadisc.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
lpfc_hw.h [SCSI] lpfc 8.3.17: SLI Additions and Fixes 2010-10-07 17:28:37 -05:00
lpfc_hw4.h
lpfc_init.c [SCSI] lpfc 8.3.17: Replace function reset methodology 2010-10-07 17:30:36 -05:00
lpfc_logmsg.h
lpfc_mbox.c
lpfc_mem.c
lpfc_nl.h
lpfc_nportdisc.c
lpfc_scsi.c [SCSI] lpfc 8.3.17: SCSI fixes 2010-10-07 17:30:18 -05:00
lpfc_scsi.h
lpfc_sli.c [SCSI] lpfc 8.3.17: Replace function reset methodology 2010-10-07 17:30:36 -05:00
lpfc_sli.h
lpfc_sli4.h [SCSI] lpfc 8.3.17: Replace function reset methodology 2010-10-07 17:30:36 -05:00
lpfc_version.h [SCSI] lpfc 8.3.17: Update lpfc driver version to 8.3.17 2010-10-07 17:30:54 -05:00
lpfc_vport.c [SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes 2010-10-07 17:26:19 -05:00
lpfc_vport.h
Makefile