Merge commit 'v2.6.39' into 20110526
authorEric Paris <eparis@redhat.com>
Thu, 26 May 2011 21:20:14 +0000 (17:20 -0400)
committerEric Paris <eparis@redhat.com>
Thu, 26 May 2011 21:20:14 +0000 (17:20 -0400)
commitea77f7a2e8561012cf100c530170f12351c3b53e
tree7302ac1064f4e364aadda84020a176804fb86e22
parent7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf
Merge commit 'v2.6.39' into 20110526

Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c
MAINTAINERS
security/selinux/hooks.c
security/selinux/ss/services.c
security/smack/smack_lsm.c