From e5769525ee7b1a0458f65176ce927c83dcf9e4af Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Tue, 3 Jan 2012 14:23:05 -0500
Subject: [PATCH] --- yaml --- r: 286047 b: refs/heads/master c:
 3035c51e8ac0512686ceb9f2bd1d13bdc6e4fb29 h: refs/heads/master i:   286045:
 617ceee8064ee464257f0d301c97ca0a6d53ac7c   286043:
 979e425bb6989acfa8ec547a7a7e560d40c4fb75   286039:
 898feaf6dca5a9d304de252860d214a6ae96a998   286031:
 097ac2f51325c2e1ce4fce9b21b73ba139f0b2b2   286015:
 17fe31d16f5c3253b89967ab87ff31c5eed03383 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/audit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 026f80c086ee..dbaa3d7f5d15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5195d8e217a78697152d64fc09a16e063a022465
+refs/heads/master: 3035c51e8ac0512686ceb9f2bd1d13bdc6e4fb29
diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c
index 2c1d6ab7106e..00efe4758c86 100644
--- a/trunk/kernel/audit.c
+++ b/trunk/kernel/audit.c
@@ -631,7 +631,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type,
 	}
 
 	*ab = audit_log_start(NULL, GFP_KERNEL, msg_type);
-	audit_log_format(*ab, "user pid=%d uid=%u auid=%u ses=%u",
+	audit_log_format(*ab, "pid=%d uid=%u auid=%u ses=%u",
 			 pid, uid, auid, ses);
 	if (sid) {
 		rc = security_secid_to_secctx(sid, &ctx, &len);