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, 10 insertions, 11 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7ca1fc8a3a76..77c1fab7d774 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -924,7 +924,7 @@ config SMC91X
           including the SMC91C94 and the SMC91C111. Say Y if you want it
           compiled into the kernel, and read the file
           <file:Documentation/networking/smc9.txt>  and the Ethernet-HOWTO,
-          available from  <http://www.linuxdoc.org/docs.html#howto>.
+          available from  <http://www.tldp.org/docs.html#howto>.
 
           This driver is also available as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want).
@@ -1034,7 +1034,7 @@ config SMC911X
           including the new LAN9115, LAN9116, LAN9117, and LAN9118.
           Say Y if you want it compiled into the kernel, 
           and read the Ethernet-HOWTO, available from
-          <http://www.linuxdoc.org/docs.html#howto>.
+          <http://www.tldp.org/docs.html#howto>.
 
           This driver is also available as a module. The module will be 
           called smc911x.  If you want to compile it as a module, say M 
@@ -1516,7 +1516,7 @@ config E100
 
           For the latest Intel PRO/100 network driver for Linux, see:
 
-          <http://appsr.intel.com/scripts-df/support_intel.asp>
+          <http://www.intel.com/p/en_US/support/highlights/network/pro100plus>
 
           More specific information on configuring the driver is in 
           <file:Documentation/networking/e100.txt>.
@@ -1542,9 +1542,8 @@ config FEALNX
         select CRC32
         select MII
         help
-          Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet
-          cards. Specifications and data at
-          <http://www.myson.com.hk/mtd/datasheet/>.
+          Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 
+          cards. <http://www.myson.com.tw/>
 
 config NATSEMI
         tristate "National Semiconductor DP8381x series PCI Ethernet support"
@@ -1718,7 +1717,7 @@ config SMSC9420
           This is a driver for SMSC's LAN9420 PCI ethernet adapter.
           Say Y if you want it compiled into the kernel,
           and read the Ethernet-HOWTO, available from
-          <http://www.linuxdoc.org/docs.html#howto>.
+          <http://www.tldp.org/docs.html#howto>.
 
           This driver is also available as a module. The module will be
           called smsc9420.  If you want to compile it as a module, say M
@@ -2565,7 +2564,7 @@ config CHELSIO_T1
           our website at <http://www.chelsio.com>.
 
           For customer support, please visit our customer support page at
-          <http://www.chelsio.com/support.htm>.
+          <http://www.chelsio.com/support.html>.
 
           Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2597,7 +2596,7 @@ config CHELSIO_T3
           our website at <http://www.chelsio.com>.
 
           For customer support, please visit our customer support page at
-          <http://www.chelsio.com/support.htm>.
+          <http://www.chelsio.com/support.html>.
 
           Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2622,7 +2621,7 @@ config CHELSIO_T4
           our website at <http://www.chelsio.com>.
 
           For customer support, please visit our customer support page at
-          <http://www.chelsio.com/support.htm>.
+          <http://www.chelsio.com/support.html>.
 
           Please send feedback to <linux-bugs@chelsio.com>.
 
@@ -2645,7 +2644,7 @@ config CHELSIO_T4VF
           our website at <http://www.chelsio.com>.
 
           For customer support, please visit our customer support page at
-          <http://www.chelsio.com/support.htm>.
+          <http://www.chelsio.com/support.html>.
 
           Please send feedback to <linux-bugs@chelsio.com>.