Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Sun, 24 Oct 2010 20:41:39 +0000 (13:41 -0700)]
* '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

101 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/arm/Kconfig
arch/arm/mach-at91/Kconfig
arch/arm/mach-omap2/hsmmc.h
arch/arm/mach-s3c2440/mach-at2440evb.c
arch/avr32/Kconfig
arch/blackfin/mach-bf527/boards/ezkit.c
arch/blackfin/mach-bf537/boards/stamp.c
arch/m68k/mac/macboing.c
arch/mips/Kconfig
arch/mips/sibyte/common/sb_tbprof.c
arch/x86/kernel/apm_32.c
arch/x86/kernel/microcode_core.c
block/blk-core.c
drivers/ata/pata_bf54x.c
drivers/base/core.c
drivers/char/agp/Kconfig
drivers/char/apm-emulation.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/char/pcmcia/cm4000_cs.c
drivers/char/stallion.c
drivers/edac/edac_device_sysfs.c
drivers/firmware/Kconfig
drivers/gpu/drm/drm_modes.c
drivers/gpu/drm/radeon/radeon_cs.c
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
drivers/hwmon/f75375s.c
drivers/ide/ide-disk.c
drivers/infiniband/hw/qib/qib_file_ops.c
drivers/macintosh/therm_adt746x.c
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/av7110_av.c
drivers/media/dvb/ttpci/av7110_ca.c
drivers/misc/Kconfig
drivers/net/Kconfig
drivers/net/appletalk/Kconfig
drivers/net/atp.c
drivers/net/epic100.c
drivers/net/ibmlana.c
drivers/net/igb/igb_main.c
drivers/net/pci-skeleton.c
drivers/net/pcmcia/3c574_cs.c
drivers/net/ps3_gelic_net.c
drivers/net/sb1250-mac.c
drivers/net/sc92031.c
drivers/net/skfp/hwt.c
drivers/net/skfp/skfddi.c
drivers/net/tlan.c
drivers/net/tokenring/tms380tr.c
drivers/net/tulip/Kconfig
drivers/net/wireless/ath/ath5k/ath5k.h
drivers/net/wireless/ath/ath5k/reg.h
drivers/net/wireless/p54/Kconfig
drivers/pci/quirks.c
drivers/pcmcia/yenta_socket.c
drivers/rtc/rtc-nuc900.c
drivers/s390/char/vmcp.c
drivers/scsi/Kconfig
drivers/scsi/aacraid/linit.c
drivers/scsi/lpfc/lpfc_hbadisc.c
drivers/scsi/sg.c
drivers/serial/8250.c
drivers/serial/bfin_sport_uart.c
drivers/serial/uartlite.c
drivers/usb/gadget/at91_udc.c
drivers/usb/gadget/f_hid.c
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/gadget/pxa27x_udc.c
drivers/usb/gadget/rndis.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/imx21-hcd.c
drivers/usb/host/ohci-hcd.c
drivers/usb/host/oxu210hp-hcd.c
drivers/usb/host/pci-quirks.c
drivers/usb/misc/ftdi-elan.c
drivers/usb/serial/Kconfig
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio_ids.h
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
drivers/usb/storage/Kconfig
drivers/video/Kconfig
fs/exofs/inode.c
fs/exofs/ios.c
fs/partitions/ldm.c
include/linux/idr.h
init/Kconfig
kernel/pm_qos_params.c
kernel/trace/trace_kprobe.c
mm/percpu.c
mm/vmscan.c
net/ipv4/Kconfig
net/ipv4/fib_trie.c
net/ipv4/netfilter/Kconfig
net/ipv4/tcp_input.c
net/irda/irnet/irnet_ppp.c
net/sunrpc/rpc_pipe.c
sound/pci/intel8x0.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/exofs/ios.c
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge
Simple merge
diff --cc mm/percpu.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
            {
@@@ -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;
Simple merge