From 63b4d9a0b5bec0fb6779d72d87e581db90f3ee60 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 9 May 2012 16:39:01 +0300 Subject: [PATCH] --- yaml --- r: 304608 b: refs/heads/master c: 4cd7a7e72e929cfe29c247293957848bc6874720 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/ioctl/ioctl-number.txt | 1 + trunk/Documentation/misc-devices/mei/TODO | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b53075c38b48..e4290469797b 100644 --- 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 index e34b531dc316..915f28c470e9 100644 --- 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 index 933b2999e19a..286fabf73377 100644 --- 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