From 8631482a3cc9403da6a6ab39f7429fbff5a2363a Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 1 May 2012 18:23:38 -0400
Subject: [PATCH] --- yaml --- r: 304532 b: refs/heads/master c:
 ffc2825c2942b57c5dbfbcb3ad798696438aed62 h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/misc/Kconfig                            | 1 +
 trunk/drivers/misc/Makefile                           | 1 +
 trunk/drivers/{staging => misc}/mei/Kconfig           | 0
 trunk/drivers/{staging => misc}/mei/Makefile          | 0
 trunk/drivers/{staging => misc}/mei/TODO              | 0
 trunk/drivers/{staging => misc}/mei/hw.h              | 0
 trunk/drivers/{staging => misc}/mei/init.c            | 0
 trunk/drivers/{staging => misc}/mei/interface.c       | 0
 trunk/drivers/{staging => misc}/mei/interface.h       | 0
 trunk/drivers/{staging => misc}/mei/interrupt.c       | 0
 trunk/drivers/{staging => misc}/mei/iorw.c            | 0
 trunk/drivers/{staging => misc}/mei/main.c            | 0
 trunk/drivers/{staging => misc}/mei/mei-amt-version.c | 0
 trunk/drivers/{staging => misc}/mei/mei.h             | 0
 trunk/drivers/{staging => misc}/mei/mei.txt           | 0
 trunk/drivers/{staging => misc}/mei/mei_dev.h         | 0
 trunk/drivers/{staging => misc}/mei/wd.c              | 0
 trunk/drivers/staging/Kconfig                         | 2 --
 trunk/drivers/staging/Makefile                        | 1 -
 20 files changed, 3 insertions(+), 4 deletions(-)
 rename trunk/drivers/{staging => misc}/mei/Kconfig (100%)
 rename trunk/drivers/{staging => misc}/mei/Makefile (100%)
 rename trunk/drivers/{staging => misc}/mei/TODO (100%)
 rename trunk/drivers/{staging => misc}/mei/hw.h (100%)
 rename trunk/drivers/{staging => misc}/mei/init.c (100%)
 rename trunk/drivers/{staging => misc}/mei/interface.c (100%)
 rename trunk/drivers/{staging => misc}/mei/interface.h (100%)
 rename trunk/drivers/{staging => misc}/mei/interrupt.c (100%)
 rename trunk/drivers/{staging => misc}/mei/iorw.c (100%)
 rename trunk/drivers/{staging => misc}/mei/main.c (100%)
 rename trunk/drivers/{staging => misc}/mei/mei-amt-version.c (100%)
 rename trunk/drivers/{staging => misc}/mei/mei.h (100%)
 rename trunk/drivers/{staging => misc}/mei/mei.txt (100%)
 rename trunk/drivers/{staging => misc}/mei/mei_dev.h (100%)
 rename trunk/drivers/{staging => misc}/mei/wd.c (100%)

diff --git a/[refs] b/[refs]
index 4bdb8ccf51ec..dc93f2280f2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 589b3d06fd159774f9f5c3639d8d5d938670c019
+refs/heads/master: ffc2825c2942b57c5dbfbcb3ad798696438aed62
diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig
index c7795096d43b..c9104282ec95 100644
--- a/trunk/drivers/misc/Kconfig
+++ b/trunk/drivers/misc/Kconfig
@@ -506,4 +506,5 @@ source "drivers/misc/ti-st/Kconfig"
 source "drivers/misc/lis3lv02d/Kconfig"
 source "drivers/misc/carma/Kconfig"
 source "drivers/misc/altera-stapl/Kconfig"
+source "drivers/misc/mei/Kconfig"
 endmenu
diff --git a/trunk/drivers/misc/Makefile b/trunk/drivers/misc/Makefile
index 3e1d80106f04..0f6af6a13345 100644
--- a/trunk/drivers/misc/Makefile
+++ b/trunk/drivers/misc/Makefile
@@ -49,3 +49,4 @@ obj-y				+= carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
 obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
 obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o
+obj-$(CONFIG_INTEL_MEI)		+= mei/
diff --git a/trunk/drivers/staging/mei/Kconfig b/trunk/drivers/misc/mei/Kconfig
similarity index 100%
rename from trunk/drivers/staging/mei/Kconfig
rename to trunk/drivers/misc/mei/Kconfig
diff --git a/trunk/drivers/staging/mei/Makefile b/trunk/drivers/misc/mei/Makefile
similarity index 100%
rename from trunk/drivers/staging/mei/Makefile
rename to trunk/drivers/misc/mei/Makefile
diff --git a/trunk/drivers/staging/mei/TODO b/trunk/drivers/misc/mei/TODO
similarity index 100%
rename from trunk/drivers/staging/mei/TODO
rename to trunk/drivers/misc/mei/TODO
diff --git a/trunk/drivers/staging/mei/hw.h b/trunk/drivers/misc/mei/hw.h
similarity index 100%
rename from trunk/drivers/staging/mei/hw.h
rename to trunk/drivers/misc/mei/hw.h
diff --git a/trunk/drivers/staging/mei/init.c b/trunk/drivers/misc/mei/init.c
similarity index 100%
rename from trunk/drivers/staging/mei/init.c
rename to trunk/drivers/misc/mei/init.c
diff --git a/trunk/drivers/staging/mei/interface.c b/trunk/drivers/misc/mei/interface.c
similarity index 100%
rename from trunk/drivers/staging/mei/interface.c
rename to trunk/drivers/misc/mei/interface.c
diff --git a/trunk/drivers/staging/mei/interface.h b/trunk/drivers/misc/mei/interface.h
similarity index 100%
rename from trunk/drivers/staging/mei/interface.h
rename to trunk/drivers/misc/mei/interface.h
diff --git a/trunk/drivers/staging/mei/interrupt.c b/trunk/drivers/misc/mei/interrupt.c
similarity index 100%
rename from trunk/drivers/staging/mei/interrupt.c
rename to trunk/drivers/misc/mei/interrupt.c
diff --git a/trunk/drivers/staging/mei/iorw.c b/trunk/drivers/misc/mei/iorw.c
similarity index 100%
rename from trunk/drivers/staging/mei/iorw.c
rename to trunk/drivers/misc/mei/iorw.c
diff --git a/trunk/drivers/staging/mei/main.c b/trunk/drivers/misc/mei/main.c
similarity index 100%
rename from trunk/drivers/staging/mei/main.c
rename to trunk/drivers/misc/mei/main.c
diff --git a/trunk/drivers/staging/mei/mei-amt-version.c b/trunk/drivers/misc/mei/mei-amt-version.c
similarity index 100%
rename from trunk/drivers/staging/mei/mei-amt-version.c
rename to trunk/drivers/misc/mei/mei-amt-version.c
diff --git a/trunk/drivers/staging/mei/mei.h b/trunk/drivers/misc/mei/mei.h
similarity index 100%
rename from trunk/drivers/staging/mei/mei.h
rename to trunk/drivers/misc/mei/mei.h
diff --git a/trunk/drivers/staging/mei/mei.txt b/trunk/drivers/misc/mei/mei.txt
similarity index 100%
rename from trunk/drivers/staging/mei/mei.txt
rename to trunk/drivers/misc/mei/mei.txt
diff --git a/trunk/drivers/staging/mei/mei_dev.h b/trunk/drivers/misc/mei/mei_dev.h
similarity index 100%
rename from trunk/drivers/staging/mei/mei_dev.h
rename to trunk/drivers/misc/mei/mei_dev.h
diff --git a/trunk/drivers/staging/mei/wd.c b/trunk/drivers/misc/mei/wd.c
similarity index 100%
rename from trunk/drivers/staging/mei/wd.c
rename to trunk/drivers/misc/mei/wd.c
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index 60221efc417b..32b02e443ed3 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -112,8 +112,6 @@ source "drivers/staging/cptm1217/Kconfig"
 
 source "drivers/staging/ste_rmi4/Kconfig"
 
-source "drivers/staging/mei/Kconfig"
-
 source "drivers/staging/nvec/Kconfig"
 
 source "drivers/staging/media/Kconfig"
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 03819581fefa..e603c0756960 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_FT1000)		+= ft1000/
 obj-$(CONFIG_SPEAKUP)		+= speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)	+= cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)	+= ste_rmi4/
-obj-$(CONFIG_INTEL_MEI)		+= mei/
 obj-$(CONFIG_MFD_NVEC)		+= nvec/
 obj-$(CONFIG_DRM_OMAP)		+= omapdrm/
 obj-$(CONFIG_ANDROID)		+= android/