Merge commit 'v2.6.29-rc1' into x86/urgent

1 files changed, 2 insertions, 2 deletions

diff --git a/security/selinux/include/avc_ss.h b/security/selinux/include/avc_ss.h
index c0d314d9f8e1..bb1ec801bdfe 100644
--- a/security/selinux/include/avc_ss.h
+++ b/security/selinux/include/avc_ss.h
@@ -17,16 +17,16 @@ struct av_perm_to_string {
 };
 
 struct av_inherit {
-        u16 tclass;
         const char **common_pts;
         u32 common_base;
+        u16 tclass;
 };
 
 struct selinux_class_perm {
         const struct av_perm_to_string *av_perm_to_string;
         u32 av_pts_len;
-        const char **class_to_string;
         u32 cts_len;
+        const char **class_to_string;
         const struct av_inherit *av_inherit;
         u32 av_inherit_len;
 };