Merge branch 'master' into next

2010-01-18 09:56:22 +11:00
parent 19439d05b8 6ccf80eb15
commit 2457552d1e
6686 changed files with 558689 additions and 327301 deletions
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -806,7 +806,7 @@ int security_bounded_transition(u32 old_sid, u32 new_sid)
 		goto out;
 	}

-	/* type/domain unchaned */
+	/* type/domain unchanged */
 	if (old_context->type == new_context->type) {
 		rc = 0;
 		goto out;