]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/block/pktcdvd.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Oct 2010 20:41:39 +0000 (13:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Oct 2010 20:41:39 +0000 (13:41 -0700)
commit229aebb873e29726b91e076161649cf45154b0bf
treeacc02a3702215bce8d914f4c8cc3d7a1382b1c67
parent8de547e1824437f3c6af180d3ed2162fa4b3f389
parent50a23e6eec6f20d55a3a920e47adb455bff6046e
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
101 files changed:
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