This commit was manufactured by cvs2git to create branch 'LINUX_2_6'.

Cherrypick from LINUX_2_6_20 2007-03-25 22:59:52 UTC zbyniu <zbyniu@pld-linux.org> '- up to 2.6.20':
    linux-2.6-apparmor-caps.patch -> 1.1.2.1.2.1

diff --git a/linux-2.6-apparmor-caps.patch b/linux-2.6-apparmor-caps.patch
new file mode 100644 (file)
index 0000000..1574b4a
--- /dev/null
+++ b/linux-2.6-apparmor-caps.patch
@@ -0,0 +1,12 @@
+--- linux-2.6.20/security/apparmor/capabilities.c~     2007-03-25 22:48:45.211484250 +0000
++++ linux-2.6.20/security/apparmor/capabilities.c      2007-03-25 22:49:42.059037000 +0000
+@@ -42,7 +42,8 @@ static const char *cap_names[] = {
+       "mknod",
+       "lease",
+       "audit_write",
+-      "audit_control"
++      "audit_control",
++      "context"
+ };
+ 
+ const char *capability_to_name(unsigned int cap)