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

4 files changed, 8 insertions, 7 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 2e9632e2c98b..8616496ffc02 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -116,7 +116,7 @@ config CHR_DEV_OSST
           <http://www.tldp.org/docs.html#howto>  and
           <file:Documentation/scsi/osst.txt>  in the kernel source.
           More info on the OnStream driver may be found on
-          <http://linux1.onstream.nl/test/>
+          <http://sourceforge.net/projects/osst/>
           Please also have a look at the standard st docu, as most of it
           applies to osst as well.
 
@@ -156,9 +156,9 @@ config CHR_DEV_SG
           directly, so you need some additional software which knows how to
           talk to these devices using the SCSI protocol:
 
-          For scanners, look at SANE (<http://www.mostang.com/sane/>). For CD
+          For scanners, look at SANE (<http://www.sane-project.org/>). For CD
           writer software look at Cdrtools
-          (<http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html>)
+          (<http://cdrecord.berlios.de/private/cdrecord.html>)
           and for burning a "disk at once": CDRDAO
           (<http://cdrdao.sourceforge.net/>). Cdparanoia is a high
           quality digital reader of audio CDs (<http://www.xiph.org/paranoia/>).
@@ -951,6 +951,7 @@ config SCSI_IPS
         ---help---
           This is support for the IBM ServeRAID hardware RAID controllers.
           See <http://www.developer.ibm.com/welcome/netfinity/serveraid.html>
+          and <http://www-947.ibm.com/support/entry/portal/docdisplay?brand=5000008&lndocid=SERV-RAID>
           for more information.  If this driver does not work correctly
           without modification please contact the author by email at
           <ipslinux@adaptec.com>.
@@ -1610,7 +1611,7 @@ config SCSI_DEBUG
           host adapter with one dummy SCSI disk. Each dummy disk uses kernel
           RAM as storage (i.e. it is a ramdisk). To save space when multiple
           dummy disks are simulated, they share the same kernel RAM for 
-          their storage. See <http://www.torque.net/sg/sdebug.html> for more
+          their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more
           information. This driver is primarily of use to those testing the
           SCSI and block subsystems. If unsure, say N.
 
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index dae46d779c7b..29c0ed1cf507 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -771,7 +771,7 @@ static long aac_compat_cfg_ioctl(struct file *file, unsigned cmd, unsigned long
 {
         if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
-        return aac_compat_do_ioctl((struct aac_dev *)file->private_data, cmd, arg);
+        return aac_compat_do_ioctl(file->private_data, cmd, arg);
 }
 #endif
 
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index c3d7174e3469..a345dde16c86 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -5509,7 +5509,7 @@ lpfc_get_rec_conf23(uint8_t *buff, uint32_t size, uint8_t rec_type)
  * @buff: Buffer containing config region 23 data.
  * @size: Size of the data buffer.
  *
- * This fuction parse the FCoE config parameters in config region 23 and
+ * This function parses the FCoE config parameters in config region 23 and
  * populate driver data structure with the parameters.
  */
 void
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 5428d53f5a13..909ed9ed24c0 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -212,7 +212,7 @@ static void sg_put_dev(Sg_device *sdp);
 
 static int sg_allow_access(struct file *filp, unsigned char *cmd)
 {
-        struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
+        struct sg_fd *sfp = filp->private_data;
 
         if (sfp->parentdp->device->type == TYPE_SCANNER)
                 return 0;