linux-next: manual merge of the moduleh tree with the scsi-rc-fixes tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/scsi/libfc/fc_lport.c between commit 77a2b73a7805 ("[SCSI] libfc:
fix fc_eh_host_reset") from the scsi-rc-fixes tree and commit
84211284f18e ("scsi: Add module.h to drivers/scsi users who really need
it") from the moduleh tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/scsi/libfc/fc_lport.c
index 628f347,f4e4885..0000000

--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c

@@@ -88,7 -88,7 +88,8 @@@
   */
  
  #include <linux/timer.h>
 +#include <linux/delay.h>
+ #include <linux/module.h>
  #include <linux/slab.h>
  #include <asm/unaligned.h>