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: (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
  ...

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc Documentation/networking/README.ipw2200
Simple merge

diff --cc Documentation/networking/bonding.txt
Simple merge

diff --cc Documentation/networking/packet_mmap.txt
Simple merge

diff --cc arch/ia64/kvm/kvm-ia64.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k8.c
Simple merge

diff --cc drivers/isdn/hardware/mISDN/hfcmulti.c
Simple merge

diff --cc drivers/isdn/hardware/mISDN/hfcpci.c
Simple merge

diff --cc drivers/isdn/hardware/mISDN/mISDNinfineon.c
Simple merge

diff --cc drivers/media/dvb/siano/smscoreapi.c
Simple merge

diff --cc drivers/media/video/gspca/sunplus.c
Simple merge

diff --cc drivers/message/fusion/mptbase.c
Simple merge

diff --cc drivers/net/benet/be_hw.h
Simple merge

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

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

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

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

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

diff --cc drivers/net/wimax/i2400m/control.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_ap.c
Simple merge

diff --cc drivers/scsi/bfa/bfa_core.c
index bef70924d5c89fa5d85ead17810b028cd42a6870,d84550636add7d85752ff455b8b2a9bfa75c7099..76fa5c5b40dde33f6700e0a66b2d0cde846c8088
--- 1/drivers/scsi/bfa/bfa_core.c
--- 2/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@@ -333,10 -333,9 +333,10 @@@ bfa_get_pciids(struct bfa_pciid_s **pci
                {BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_FC_8G2P},
                {BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_FC_8G1P},
                {BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_CT},
 +              {BFA_PCI_VENDOR_ID_BROCADE, BFA_PCI_DEVICE_ID_CT_FC},
        };
  
-       *npciids = sizeof(__pciids) / sizeof(__pciids[0]);
+       *npciids = ARRAY_SIZE(__pciids);
        *pciids = __pciids;
  }
  

diff --cc drivers/scsi/bfa/bfa_fcs.c
index 3ec2f49de61d67fc2b4eca22675e17f0a6c7d3a4,153cb2a3ffe32afb2b8f10eae95fed70e63ccf7c..d1a99209bf5f9fbd7260b470ececa3a25b733829
--- 1/drivers/scsi/bfa/bfa_fcs.c
--- 2/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@@ -99,11 -99,10 +99,11 @@@ bfa_fcs_attach(struct bfa_fcs_s *fcs, s
  void
  bfa_fcs_init(struct bfa_fcs_s *fcs)
  {
 -      int             i;
 +      int i, npbc_vports;
        struct bfa_fcs_mod_s  *mod;
 +      struct bfi_pbc_vport_s pbc_vports[BFI_PBC_MAX_VPORTS];
  
-       for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
+       for (i = 0; i < ARRAY_SIZE(fcs_modules); i++) {
                mod = &fcs_modules[i];
                if (mod->modinit)
                        mod->modinit(fcs);

diff --cc drivers/scsi/bfa/bfa_ioim.c
Simple merge

diff --cc drivers/scsi/bfa/vport.c
Simple merge

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

diff --cc drivers/scsi/libfc/fc_exch.c
Simple merge

diff --cc drivers/scsi/libfc/fc_lport.c
Simple merge

diff --cc drivers/scsi/libfc/fc_rport.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_base.h
index 0ebef0c0d949e2c05e854af6acb8b939bccd99c0,41c29a86e83494dfe922e1982e69bddc95e4e5b7..0b15a8bdebfc4a62f7bd119b2fca641c9d48cac8
--- 1/drivers/scsi/mpt2sas/mpt2sas_base.h
--- 2/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@@ -475,9 -474,8 +475,9 @@@ typedef void (*MPT_ADD_SGE)(void *paddr
   * @shost_recovery: host reset in progress
   * @ioc_reset_in_progress_lock:
   * @ioc_link_reset_in_progress: phy/hard reset in progress
-  * @ignore_loginfos: ignore loginfos during task managment
+  * @ignore_loginfos: ignore loginfos during task management
   * @remove_host: flag for when driver unloads, to avoid sending dev resets
 + * @pci_error_recovery: flag to prevent ioc access until slot reset completes
   * @wait_for_port_enable_to_complete:
   * @msix_enable: flag indicating msix is enabled
   * @msix_vector_count: number msix vectors

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_hwi.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_iocb.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_nx.h
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_init.c
Simple merge

diff --cc fs/compat_ioctl.c
Simple merge

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

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

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

diff --cc kernel/power/hibernate.c
Simple merge

diff --cc kernel/power/swap.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge