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

3 files changed, 16 insertions, 16 deletions

diff --git a/arch/arm/common/icst.c b/arch/arm/common/icst.c
index 9a7f09cff300..2dc6da70ae59 100644
--- a/arch/arm/common/icst.c
+++ b/arch/arm/common/icst.c
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  *
  *  Support functions for calculating clocks/divisors for the ICST307
- *  clock generators.  See http://www.icst.com/ for more information
+ *  clock generators.  See http://www.idt.com/ for more information
  *  on these devices.
  *
  *  This is an almost identical implementation to the ICST525 clock generator.
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 9012004321dd..c11af1e4bad3 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -44,12 +44,12 @@ void reset_scoop(struct device *dev)
 {
         struct scoop_dev *sdev = dev_get_drvdata(dev);
 
-        iowrite16(0x0100, sdev->base + SCOOP_MCR);  // 00
-        iowrite16(0x0000, sdev->base + SCOOP_CDR);  // 04
-        iowrite16(0x0000, sdev->base + SCOOP_CCR);  // 10
-        iowrite16(0x0000, sdev->base + SCOOP_IMR);  // 18
-        iowrite16(0x00FF, sdev->base + SCOOP_IRM);  // 14
-        iowrite16(0x0000, sdev->base + SCOOP_ISR);  // 1C
+        iowrite16(0x0100, sdev->base + SCOOP_MCR);  /* 00 */
+        iowrite16(0x0000, sdev->base + SCOOP_CDR);  /* 04 */
+        iowrite16(0x0000, sdev->base + SCOOP_CCR);  /* 10 */
+        iowrite16(0x0000, sdev->base + SCOOP_IMR);  /* 18 */
+        iowrite16(0x00FF, sdev->base + SCOOP_IRM);  /* 14 */
+        iowrite16(0x0000, sdev->base + SCOOP_ISR);  /* 1C */
         iowrite16(0x0000, sdev->base + SCOOP_IRM);
 }
 
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c
index b520e56216a9..bef408f3d76c 100644
--- a/arch/arm/common/uengine.c
+++ b/arch/arm/common/uengine.c
@@ -312,16 +312,16 @@ static void generate_ucode(u8 *ucode, u32 *gpr_a, u32 *gpr_b)
                 b1 = (gpr_a[i] >> 8) & 0xff;
                 b0 = gpr_a[i] & 0xff;
 
-                // immed[@ai, (b1 << 8) | b0]
-                // 11110000 0000VVVV VVVV11VV VVVVVV00 1IIIIIII
+                /* immed[@ai, (b1 << 8) | b0] */
+                /* 11110000 0000VVVV VVVV11VV VVVVVV00 1IIIIIII */
                 ucode[offset++] = 0xf0;
                 ucode[offset++] = (b1 >> 4);
                 ucode[offset++] = (b1 << 4) | 0x0c | (b0 >> 6);
                 ucode[offset++] = (b0 << 2);
                 ucode[offset++] = 0x80 | i;
 
-                // immed_w1[@ai, (b3 << 8) | b2]
-                // 11110100 0100VVVV VVVV11VV VVVVVV00 1IIIIIII
+                /* immed_w1[@ai, (b3 << 8) | b2] */
+                /* 11110100 0100VVVV VVVV11VV VVVVVV00 1IIIIIII */
                 ucode[offset++] = 0xf4;
                 ucode[offset++] = 0x40 | (b3 >> 4);
                 ucode[offset++] = (b3 << 4) | 0x0c | (b2 >> 6);
@@ -340,16 +340,16 @@ static void generate_ucode(u8 *ucode, u32 *gpr_a, u32 *gpr_b)
                 b1 = (gpr_b[i] >> 8) & 0xff;
                 b0 = gpr_b[i] & 0xff;
 
-                // immed[@bi, (b1 << 8) | b0]
-                // 11110000 0000VVVV VVVV001I IIIIII11 VVVVVVVV
+                /* immed[@bi, (b1 << 8) | b0] */
+                /* 11110000 0000VVVV VVVV001I IIIIII11 VVVVVVVV */
                 ucode[offset++] = 0xf0;
                 ucode[offset++] = (b1 >> 4);
                 ucode[offset++] = (b1 << 4) | 0x02 | (i >> 6);
                 ucode[offset++] = (i << 2) | 0x03;
                 ucode[offset++] = b0;
 
-                // immed_w1[@bi, (b3 << 8) | b2]
-                // 11110100 0100VVVV VVVV001I IIIIII11 VVVVVVVV
+                /* immed_w1[@bi, (b3 << 8) | b2] */
+                /* 11110100 0100VVVV VVVV001I IIIIII11 VVVVVVVV */
                 ucode[offset++] = 0xf4;
                 ucode[offset++] = 0x40 | (b3 >> 4);
                 ucode[offset++] = (b3 << 4) | 0x02 | (i >> 6);
@@ -357,7 +357,7 @@ static void generate_ucode(u8 *ucode, u32 *gpr_a, u32 *gpr_b)
                 ucode[offset++] = b2;
         }
 
-        // ctx_arb[kill]
+        /* ctx_arb[kill] */
         ucode[offset++] = 0xe0;
         ucode[offset++] = 0x00;
         ucode[offset++] = 0x01;