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

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 5cb58655cd5f..f56a6316e134 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1230,7 +1230,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt;
         p_ctx->cr[8] = 0x3c;
 
-        /*Initilize region register*/
+        /*Initialize region register*/
         p_ctx->rr[0] = 0x30;
         p_ctx->rr[1] = 0x30;
         p_ctx->rr[2] = 0x30;
@@ -1239,7 +1239,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         p_ctx->rr[5] = 0x30;
         p_ctx->rr[7] = 0x30;
 
-        /*Initilize branch register 0*/
+        /*Initialize branch register 0*/
         p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry;
 
         vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr;
@@ -1700,7 +1700,7 @@ static int kvm_relocate_vmm(struct kvm_vmm_info *vmm_info,
         BUG_ON(!module);
 
         if (!kvm_vmm_base) {
-                printk("kvm: kvm area hasn't been initilized yet!!\n");
+                printk("kvm: kvm area hasn't been initialized yet!!\n");
                 return -EFAULT;
         }