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

Conflicts:

	include/asm-x86/statfs.h

1 files changed, 7 insertions, 7 deletions

diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
index 77d745da48bb..b5407f16c2a4 100644
--- a/security/selinux/ss/mls.c
+++ b/security/selinux/ss/mls.c
@@ -283,8 +283,8 @@ int mls_context_to_sid(struct policydb *pol,
                 p++;
 
         delim = *p;
-        if (delim != 0)
-                *p++ = 0;
+        if (delim != '\0')
+                *p++ = '\0';
 
         for (l = 0; l < 2; l++) {
                 levdatum = hashtab_search(pol->p_levels.table, scontextp);
@@ -302,14 +302,14 @@ int mls_context_to_sid(struct policydb *pol,
                                 while (*p && *p != ',' && *p != '-')
                                         p++;
                                 delim = *p;
-                                if (delim != 0)
-                                        *p++ = 0;
+                                if (delim != '\0')
+                                        *p++ = '\0';
 
                                 /* Separate into range if exists */
                                 rngptr = strchr(scontextp, '.');
                                 if (rngptr != NULL) {
                                         /* Remove '.' */
-                                        *rngptr++ = 0;
+                                        *rngptr++ = '\0';
                                 }
 
                                 catdatum = hashtab_search(pol->p_cats.table,
@@ -357,8 +357,8 @@ int mls_context_to_sid(struct policydb *pol,
                                 p++;
 
                         delim = *p;
-                        if (delim != 0)
-                                *p++ = 0;
+                        if (delim != '\0')
+                                *p++ = '\0';
                 } else
                         break;
         }