Merge branch 'master' into next

This commit is contained in:
James Morris 2010-01-18 09:56:22 +11:00
commit 2457552d1e
6630 changed files with 539846 additions and 308458 deletions

View file

@ -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;