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/ipc/sem.c b/ipc/sem.c
index ae040a0727c..34193ed69fb 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1362,7 +1362,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
          * semid identifiers are not unique - find_alloc_undo may have
          * allocated an undo structure, it was invalidated by an RMID
          * and now a new array with received the same id. Check and fail.
-         * This case can be detected checking un->semid. The existance of
+         * This case can be detected checking un->semid. The existence of
          * "un" itself is guaranteed by rcu.
          */
         error = -EIDRM;