From 2ebfd631f0054b5e81b26ee391c48c4279f6befe Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 9 May 2012 16:39:00 +0300
Subject: [PATCH] --- yaml --- r: 304607 b: refs/heads/master c:
 5a44988207ee16b96e5445b8e95ab9881ce310cc h: refs/heads/master i:   304605:
 d3797b05254e54d6e43e7e0b35616b9d938444f5   304603:
 7356b83f0d22d4cc7ce0207882a185bb8a1c09e8   304599:
 7d41d3ae6ffc6806aaa6cfe7c175177dc7b10834   304591:
 7b37a065c6324982dcbc41334c5c987ce4ff4d23   304575:
 ee1011538f68bb12790c1a2e1554b3403c7b0e06 v: v3

---
 [refs]                                                   | 2 +-
 trunk/Documentation/Makefile                             | 2 +-
 trunk/Documentation/misc-devices/mei/Makefile            | 8 ++++++++
 trunk/Documentation/misc-devices/mei/TODO                | 5 +++++
 .../misc-devices}/mei/mei-amt-version.c                  | 0
 .../misc => Documentation/misc-devices}/mei/mei.txt      | 0
 trunk/drivers/misc/mei/TODO                              | 9 ---------
 7 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 trunk/Documentation/misc-devices/mei/Makefile
 create mode 100644 trunk/Documentation/misc-devices/mei/TODO
 rename trunk/{drivers/misc => Documentation/misc-devices}/mei/mei-amt-version.c (100%)
 rename trunk/{drivers/misc => Documentation/misc-devices}/mei/mei.txt (100%)
 delete mode 100644 trunk/drivers/misc/mei/TODO

diff --git a/[refs] b/[refs]
index 68f5642efe0a..b53075c38b48 100644
--- 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
index 30b656ece7aa..31d302bc5863 100644
--- 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
new file mode 100644
index 000000000000..00e8c3e836ff
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..933b2999e19a
--- /dev/null
+++ 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 b/trunk/Documentation/misc-devices/mei/mei-amt-version.c
similarity index 100%
rename from trunk/drivers/misc/mei/mei-amt-version.c
rename to trunk/Documentation/misc-devices/mei/mei-amt-version.c
diff --git a/trunk/drivers/misc/mei/mei.txt b/trunk/Documentation/misc-devices/mei/mei.txt
similarity index 100%
rename from trunk/drivers/misc/mei/mei.txt
rename to trunk/Documentation/misc-devices/mei/mei.txt
diff --git a/trunk/drivers/misc/mei/TODO b/trunk/drivers/misc/mei/TODO
deleted file mode 100644
index ed4d16c30ab5..000000000000
--- a/trunk/drivers/misc/mei/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-TODO:
-	- Cleanup and split the timer function
-Upon Unstaging:
-	- Documentation/ioctl/ioctl-number.txt
-	- move mei.txt under Documentation/mei/
-	- move mei-amt-version.c under Documentation/mei
-	- add hostprogs-y for mei-amt-version.c
-	- drop mei_version.h
-	- Updated MAINTAINERS