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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/hsmmc.h
index 1fe6f01,6536c31..0f8a2e6
--- 1/arch/arm/mach-omap2/hsmmc.h
--- 2/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@@ -23,10 -21,8 +23,10 @@@ struct omap2_hsmmc_info 
        char    *name;          /* or NULL for default */
        struct device *dev;     /* returned: pointer to mmc adapter */
        int     ocr_mask;       /* temporary HACK */
-       /* Remux (pad configuation) when powering on/off */
+       /* Remux (pad configuration) when powering on/off */
        void (*remux)(struct device *dev, int slot, int power_on);
 +      /* init some special card */
 +      void (*init_card)(struct mmc_card *card);
  };
  
  #if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

diff --cc arch/arm/mach-s3c2440/mach-at2440evb.c
Simple merge

diff --cc arch/avr32/Kconfig
Simple merge

diff --cc arch/blackfin/mach-bf527/boards/ezkit.c
Simple merge

diff --cc arch/blackfin/mach-bf537/boards/stamp.c
Simple merge

diff --cc arch/m68k/mac/macboing.c
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/sibyte/common/sb_tbprof.c
Simple merge

diff --cc arch/x86/kernel/apm_32.c
Simple merge

diff --cc arch/x86/kernel/microcode_core.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/ata/pata_bf54x.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/char/agp/Kconfig
Simple merge

diff --cc drivers/char/apm-emulation.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/char/pcmcia/cm4000_cs.c
Simple merge

diff --cc drivers/char/stallion.c
Simple merge

diff --cc drivers/edac/edac_device_sysfs.c
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_modes.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_cs.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
Simple merge

diff --cc drivers/hwmon/f75375s.c
Simple merge

diff --cc drivers/ide/ide-disk.c
Simple merge

diff --cc drivers/infiniband/hw/qib/qib_file_ops.c
Simple merge

diff --cc drivers/macintosh/therm_adt746x.c
Simple merge

diff --cc drivers/media/dvb/ttpci/av7110.c
Simple merge

diff --cc drivers/media/dvb/ttpci/av7110_av.c
Simple merge

diff --cc drivers/media/dvb/ttpci/av7110_ca.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/appletalk/Kconfig
Simple merge

diff --cc drivers/net/atp.c
Simple merge

diff --cc drivers/net/epic100.c
Simple merge

diff --cc drivers/net/ibmlana.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/pci-skeleton.c
Simple merge

diff --cc drivers/net/pcmcia/3c574_cs.c
Simple merge

diff --cc drivers/net/ps3_gelic_net.c
Simple merge

diff --cc drivers/net/sb1250-mac.c
Simple merge

diff --cc drivers/net/sc92031.c
Simple merge

diff --cc drivers/net/skfp/hwt.c
Simple merge

diff --cc drivers/net/skfp/skfddi.c
Simple merge

diff --cc drivers/net/tlan.c
Simple merge

diff --cc drivers/net/tokenring/tms380tr.c
Simple merge

diff --cc drivers/net/tulip/Kconfig
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/ath5k.h
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/reg.h
Simple merge

diff --cc drivers/net/wireless/p54/Kconfig
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/pcmcia/yenta_socket.c
Simple merge

diff --cc drivers/rtc/rtc-nuc900.c
index 62de66a,08f95bd..ddb0857
--- 1/drivers/rtc/rtc-nuc900.c
--- 2/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@@ -274,11 -279,12 +274,11 @@@ static int __devinit nuc900_rtc_probe(s
        nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev,
                                                &nuc900_rtc_ops, THIS_MODULE);
        if (IS_ERR(nuc900_rtc->rtcdev)) {
-               dev_err(&pdev->dev, "rtc device register faild\n");
+               dev_err(&pdev->dev, "rtc device register failed\n");
                err = PTR_ERR(nuc900_rtc->rtcdev);
 -              goto fail4;
 +              goto fail3;
        }
  
 -      platform_set_drvdata(pdev, nuc900_rtc);
        __raw_writel(__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_TSSR) | MODE24,
                                        nuc900_rtc->rtc_reg + REG_RTC_TSSR);
  

diff --cc drivers/s390/char/vmcp.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/aacraid/linit.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_hbadisc.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/serial/bfin_sport_uart.c
Simple merge

diff --cc drivers/serial/uartlite.c
Simple merge

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge

diff --cc drivers/usb/gadget/f_hid.c
Simple merge

diff --cc drivers/usb/gadget/fsl_udc_core.c
Simple merge

diff --cc drivers/usb/gadget/pxa27x_udc.c
Simple merge

diff --cc drivers/usb/gadget/rndis.c
index 5b31404,eb61ab4..d3cdffe
--- 1/drivers/usb/gadget/rndis.c
--- 2/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@@ -912,14 -910,12 +912,12 @@@ int rndis_register(void (*resp_avail)(v
        return -ENODEV;
  }
  
 -void rndis_deregister (int configNr)
 +void rndis_deregister(int configNr)
  {
 -      pr_debug("%s: \n", __func__);
 +      pr_debug("%s:\n", __func__);
  
        if (configNr >= RNDIS_MAX_CONFIGS) return;
 -      rndis_per_dev_params [configNr].used = 0;
 +      rndis_per_dev_params[configNr].used = 0;
- 
-       return;
  }
  
  int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/usb/host/imx21-hcd.c
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/usb/host/oxu210hp-hcd.c
Simple merge

diff --cc drivers/usb/host/pci-quirks.c
Simple merge

diff --cc drivers/usb/misc/ftdi-elan.c
Simple merge

diff --cc drivers/usb/serial/Kconfig
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
index 37b57c7,4fc588c..89a9a58
--- 1/drivers/usb/serial/ftdi_sio.c
--- 2/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@@ -2107,8 -2066,9 +2107,7 @@@ static void ftdi_set_termios(struct tty
                        }
                }
  
 -              /* lower DTR/RTS */
 -              clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
        }
-       return;
  }
  
  static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)

diff --cc drivers/usb/serial/ftdi_sio_ids.h
Simple merge

diff --cc drivers/usb/serial/io_edgeport.c
Simple merge

diff --cc drivers/usb/serial/io_ti.c
Simple merge

diff --cc drivers/usb/serial/mos7720.c
Simple merge

diff --cc drivers/usb/serial/mos7840.c
Simple merge

diff --cc drivers/usb/storage/Kconfig
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc fs/exofs/inode.c
Simple merge

diff --cc fs/exofs/ios.c
Simple merge

diff --cc fs/partitions/ldm.c
Simple merge

diff --cc include/linux/idr.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/pm_qos_params.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc mm/percpu.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc net/ipv4/Kconfig
Simple merge

diff --cc net/ipv4/fib_trie.c
Simple merge

diff --cc net/ipv4/netfilter/Kconfig
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/irda/irnet/irnet_ppp.c
index 0993bd4,36f43ca..7fa8637
--- 1/net/irda/irnet/irnet_ppp.c
--- 2/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@@ -664,10 -663,8 +664,10 @@@ dev_irnet_ioctl
        if((val == N_SYNC_PPP) || (val == N_PPP))
        {
          DEBUG(FS_INFO, "Entering PPP discipline.\n");
-         /* PPP channel setup (ap->chan in configued in dev_irnet_open())*/
+         /* PPP channel setup (ap->chan in configured in dev_irnet_open())*/
 -        lock_kernel();
 +        if (mutex_lock_interruptible(&ap->lock))
 +                return -EINTR;
 +
          err = ppp_register_channel(&ap->chan);
          if(err == 0)
            {

diff --cc net/sunrpc/rpc_pipe.c
index 28bcd52,1f7fc50..52f2524
--- 1/net/sunrpc/rpc_pipe.c
--- 2/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@@ -325,10 -322,9 +325,10 @@@ rpc_pipe_ioctl(struct file *filp, unsig
                len = rpci->pipelen;
                if (filp->private_data) {
                        struct rpc_pipe_msg *msg;
-                       msg = (struct rpc_pipe_msg *)filp->private_data;
+                       msg = filp->private_data;
                        len += msg->len - msg->copied;
                }
 +              spin_unlock(&inode->i_lock);
                return put_user(len, (int __user *)arg);
        default:
                return -EINVAL;

diff --cc sound/pci/intel8x0.c
Simple merge