From 3054b5572892fdcad05eeb004b5b0e24ce9c7d8f Mon Sep 17 00:00:00 2001
From: Andras Domokos <andras.domokos@nokia.com>
Date: Thu, 6 May 2010 15:10:47 +0300
Subject: [PATCH] --- yaml --- r: 298422 b: refs/heads/master c:
 43139a61fc68f4b0af7327a0e63f340a7c81c69a h: refs/heads/master 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 ab167f6782da..7389877ef0b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4ac73a701288f633fbf2369ffaae4841aa295b3
+refs/heads/master: 43139a61fc68f4b0af7327a0e63f340a7c81c69a
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
index 54078ed96b37..af76fdef6046 100644
--- a/trunk/Documentation/ioctl/ioctl-number.txt
+++ b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -223,6 +223,7 @@ Code  Seq#(hex)	Include File		Comments
 'j'	00-3F	linux/joystick.h
 'k'	00-0F	linux/spi/spidev.h	conflict!
 'k'	00-05	video/kyro.h		conflict!
+'k'	10-17	linux/hsi/hsi_char.h	HSI character device
 'l'	00-3F	linux/tcfs_fs.h		transparent cryptographic file system
 					<http://web.archive.org/web/*/http://mikonos.dia.unisa.it/tcfs>
 'l'	40-7F	linux/udf_fs_i.h	in development: