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

1 files changed, 6 insertions, 6 deletions

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);
 }