From 913db6be6e8344c81a9eb4f2fc9c8d71d0c17e83 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Thu, 22 Jul 2010 19:50:32 +0200
Subject: [PATCH] --- yaml --- r: 206787 b: refs/heads/master c:
 aed69d2b79bb5af008526998e466da6d0eac7ae5 h: refs/heads/master i:   206785:
 add966cca6f7c2610a8a16d152e8cda54245f7d3   206783:
 0226ca6c52b398e4f35214112673e9866653429d v: v3

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

diff --git a/[refs] b/[refs]
index f67257dc4881..c16c64efe8d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7429b17d30a19fd52a0c07de9d3959746d321e15
+refs/heads/master: aed69d2b79bb5af008526998e466da6d0eac7ae5
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
index dd5806f4fcc4..81ff9fc896df 100644
--- a/trunk/Documentation/ioctl/ioctl-number.txt
+++ b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -79,6 +79,7 @@ Code  Seq#(hex)	Include File		Comments
 0x22	all	scsi/sg.h
 '#'	00-3F	IEEE 1394 Subsystem	Block for the entire subsystem
 '$'	00-0F	linux/perf_counter.h, linux/perf_event.h
+'&'	00-07	drivers/firewire/nosy-user.h
 '1'	00-1F	<linux/timepps.h>	PPS kit from Ulrich Windl
 					<ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/>
 '2'	01-04	linux/i2o.h