---

yaml --- r: 304607 b: refs/heads/master c: 5a44988 h: refs/heads/master i: 304605: d3797b0 304603: 7356b83 304599: 7d41d3a 304591: 7b37a06 304575: ee10115 v: v3
git-mirror · May 9, 2012 · 2ebfd63 · 2ebfd63
1 parent 3a79a6e
commit 2ebfd63
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f3afe1d8c8e5dc41bb5820c01b4f3cfc2dc1205
+refs/heads/master: 5a44988207ee16b96e5445b8e95ab9881ce310cc
diff --git a/trunk/Documentation/Makefile b/trunk/Documentation/Makefile
@@ -1,3 +1,3 @@
 obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
 	filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
-	pcmcia/ spi/ timers/ watchdog/src/
+	pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/
diff --git a/trunk/Documentation/misc-devices/mei/Makefile b/trunk/Documentation/misc-devices/mei/Makefile
@@ -0,0 +1,8 @@
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
+
+# List of programs to build
+hostprogs-y := mei-amt-version
+HOSTCFLAGS_mei-amt-version.o += -I$(objtree)/usr/include
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
diff --git a/trunk/Documentation/misc-devices/mei/TODO b/trunk/Documentation/misc-devices/mei/TODO
@@ -0,0 +1,5 @@
+TODO:
+	- Cleanup and split the timer function
+Upon Unstaging:
+	- Documentation/ioctl/ioctl-number.txt
+	- Updated MAINTAINERS
diff --git a/trunk/drivers/misc/mei/mei-amt-version.c → ...tation/misc-devices/mei/mei-amt-version.c b/trunk/drivers/misc/mei/mei-amt-version.c → ...tation/misc-devices/mei/mei-amt-version.c
diff --git a/trunk/drivers/misc/mei/mei.txt → trunk/Documentation/misc-devices/mei/mei.txt b/trunk/drivers/misc/mei/mei.txt → trunk/Documentation/misc-devices/mei/mei.txt
diff --git a/trunk/drivers/misc/mei/TODO b/trunk/drivers/misc/mei/TODO