Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4cd7a7e72e929cfe29c247293957848bc6874720

Authored by Tomas Winkler
Committed by Greg Kroah-Hartman
1 parent 5a44988207
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mei: update Documentation/ioctl/ioctl-number.txt 

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 2 changed files with 1 additions and 1 deletions Side-by-side Diff

Documentation/ioctl/ioctl-number.txt
Diff comments   View file @ 4cd7a7e
... ... @@ -120,6 +120,7 @@
120 120 'G' 00-0F linux/gigaset_dev.h conflict!
121 121 'H' 00-7F linux/hiddev.h conflict!
122 122 'H' 00-0F linux/hidraw.h conflict!
  123 +'H' 01 linux/mei.h conflict!
123 124 'H' 00-0F sound/asound.h conflict!
124 125 'H' 20-40 sound/asound_fm.h conflict!
125 126 'H' 80-8F sound/sfnt_info.h conflict!
Documentation/misc-devices/mei/TODO
Diff comments   View file @ 4cd7a7e
1 1 TODO:
2 2 - Cleanup and split the timer function
3 3 Upon Unstaging:
4   - - Documentation/ioctl/ioctl-number.txt
5 4 - Updated MAINTAINERS