Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 9194a4b52b2..73c47bd95db 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -311,7 +311,7 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu)
 
         /*
          * a lot of B2 instructions are priviledged. We first check for
-         * the priviledges ones, that we can handle in the kernel. If the
+         * the privileged ones, that we can handle in the kernel. If the
          * kernel can handle this instruction, we check for the problem
          * state bit and (a) handle the instruction or (b) send a code 2
          * program check.