---

yaml --- r: 304608 b: refs/heads/master c: 4cd7a7e h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 63b4d9a · 63b4d9a
1 parent 2ebfd63
commit 63b4d9a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a44988207ee16b96e5445b8e95ab9881ce310cc
+refs/heads/master: 4cd7a7e72e929cfe29c247293957848bc6874720
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -120,6 +120,7 @@ Code  Seq#(hex)	Include File		Comments
 'G'	00-0F	linux/gigaset_dev.h	conflict!
 'H'	00-7F	linux/hiddev.h		conflict!
 'H'	00-0F	linux/hidraw.h		conflict!
+'H'	01	linux/mei.h		conflict!
 'H'	00-0F	sound/asound.h		conflict!
 'H'	20-40	sound/asound_fm.h	conflict!
 'H'	80-8F	sound/sfnt_info.h	conflict!

diff --git a/trunk/Documentation/misc-devices/mei/TODO b/trunk/Documentation/misc-devices/mei/TODO
@@ -1,5 +1,4 @@
 TODO:
 	- Cleanup and split the timer function
 Upon Unstaging:
-	- Documentation/ioctl/ioctl-number.txt
 	- Updated MAINTAINERS