| commit | ea77f7a2e8561012cf100c530170f12351c3b53e | [log] [tgz] |
|---|---|---|
| author | Eric Paris <eparis@redhat.com> | Thu May 26 17:20:14 2011 -0400 |
| committer | Eric Paris <eparis@redhat.com> | Thu May 26 17:20:14 2011 -0400 |
| tree | 7302ac1064f4e364aadda84020a176804fb86e22 | |
| parent | 7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e [diff] | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf [diff] |
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