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, 4 insertions, 4 deletions

diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig
index 2a72aa96a568..705e53ef4af0 100644
--- a/net/ax25/Kconfig
+++ b/net/ax25/Kconfig
@@ -7,7 +7,7 @@ menuconfig HAMRADIO
         bool "Amateur Radio support"
         help
           If you want to connect your Linux box to an amateur radio, answer Y
-          here. You want to read <http://www.tapr.org/tapr/html/pkthome.html>
+          here. You want to read <http://www.tapr.org/>
           and more specifically about AX.25 on Linux
           <http://www.linux-ax25.org/>.
 
@@ -42,7 +42,7 @@ config AX25
           check out the file <file:Documentation/networking/ax25.txt> in the
           kernel source. More information about digital amateur radio in
           general is on the WWW at
-          <http://www.tapr.org/tapr/html/pkthome.html>.
+          <http://www.tapr.org/>.
 
           To compile this driver as a module, choose M here: the
           module will be called ax25.
@@ -89,7 +89,7 @@ config NETROM
           <http://www.linux-ax25.org>. You also might want to check out the
           file <file:Documentation/networking/ax25.txt>. More information about
           digital amateur radio in general is on the WWW at
-          <http://www.tapr.org/tapr/html/pkthome.html>.
+          <http://www.tapr.org/>.
 
           To compile this driver as a module, choose M here: the
           module will be called netrom.
@@ -108,7 +108,7 @@ config ROSE
           <http://www.linux-ax25.org>.  You also might want to check out the
           file <file:Documentation/networking/ax25.txt>. More information about
           digital amateur radio in general is on the WWW at
-          <http://www.tapr.org/tapr/html/pkthome.html>.
+          <http://www.tapr.org/>.
 
           To compile this driver as a module, choose M here: the
           module will be called rose.