Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Aug 2010 22:31:02 +0000 (15:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Aug 2010 22:31:02 +0000 (15:31 -0700)
commit3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
tree5adc1ff2eaf64d450bf28bb6b2ce890db2567288
parent5cf65713f87775c548e3eb48dbafa32e12f28000
parent0ea6e61122196509af82cc4f36cbdaacbefb8227
Merge branch 'for-next' of git://git./linux/kernel/git/jikos/trivial

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...
43 files changed:
Documentation/feature-removal-schedule.txt
Documentation/networking/README.ipw2200
Documentation/networking/bonding.txt
Documentation/networking/packet_mmap.txt
arch/ia64/kvm/kvm-ia64.c
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
drivers/isdn/hardware/mISDN/hfcmulti.c
drivers/isdn/hardware/mISDN/hfcpci.c
drivers/isdn/hardware/mISDN/mISDNinfineon.c
drivers/media/dvb/siano/smscoreapi.c
drivers/media/video/gspca/sunplus.c
drivers/message/fusion/mptbase.c
drivers/net/benet/be_hw.h
drivers/net/gianfar.c
drivers/net/hp100.c
drivers/net/ksz884x.c
drivers/net/ll_temac_main.c
drivers/net/sh_eth.c
drivers/net/wimax/i2400m/control.c
drivers/net/wireless/hostap/hostap_ap.c
drivers/scsi/bfa/bfa_core.c
drivers/scsi/bfa/bfa_fcs.c
drivers/scsi/bfa/bfa_ioim.c
drivers/scsi/bfa/vport.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/libfc/fc_exch.c
drivers/scsi/libfc/fc_lport.c
drivers/scsi/libfc/fc_rport.c
drivers/scsi/mpt2sas/mpt2sas_base.h
drivers/scsi/mpt2sas/mpt2sas_scsih.c
drivers/scsi/pm8001/pm8001_hwi.c
drivers/scsi/qla2xxx/qla_iocb.c
drivers/scsi/qla2xxx/qla_nx.h
drivers/scsi/qla4xxx/ql4_init.c
fs/compat_ioctl.c
include/linux/if_link.h
include/linux/kernel.h
include/linux/netdevice.h
kernel/power/hibernate.c
kernel/power/swap.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/sctp/protocol.c
security/smack/smack_lsm.c