From 17e5e9b7684f751448ec04a2c5a818d1dae6d35b Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 11 Sep 2011 17:59:04 -0400
Subject: [PATCH] --- yaml --- r: 263742 b: refs/heads/master c:
 14d01ff5341866773e24c5b54a94f7e2520ca271 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/Documentation/ioctl/ioctl-number.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f49631322d91..1b81e3859bac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b001b2edaead6fd906b1f87967ae05f082189c4
+refs/heads/master: 14d01ff5341866773e24c5b54a94f7e2520ca271
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
index 845a191004b1..54078ed96b37 100644
--- a/trunk/Documentation/ioctl/ioctl-number.txt
+++ b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -319,4 +319,6 @@ Code  Seq#(hex)	Include File		Comments
 					<mailto:thomas@winischhofer.net>
 0xF4	00-1F	video/mbxfb.h		mbxfb
 					<mailto:raph@8d.com>
+0xF6	all	LTTng			Linux Trace Toolkit Next Generation
+					<mailto:mathieu.desnoyers@efficios.com>
 0xFD	all	linux/dm-ioctl.h