Merge branch 'next-queue' into next

2010-03-09 12:46:47 +11:00
parent eaa5eec739 634a539e16
commit c43a752347
9 changed files with 9 additions and 18 deletions
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -323,7 +323,7 @@ extern int ss_initialized;

 /* The file system's label must be initialized prior to use. */

-static char *labeling_behaviors[6] = {
+static const char *labeling_behaviors[6] = {
 	"uses xattr",
 	"uses transition SIDs",
 	"uses task SIDs",