Pull thinkpad into release branch

Conflicts:

	drivers/misc/Kconfig

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 277877a34ef6..d0243d07da20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1632,15 +1632,6 @@ W:	http://www.ia64-linux.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 S:      Maintained
 
-IBM ACPI EXTRAS DRIVER
-P:      Henrique de Moraes Holschuh
-M:      ibm-acpi@hmh.eng.br
-L:      ibm-acpi-devel@lists.sourceforge.net
-W:      http://ibm-acpi.sourceforge.net
-W:      http://thinkwiki.org/wiki/Ibm-acpi
-T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
-S:      Maintained
-
 SN-IA64 (Itanium) SUB-PLATFORM
 P:      Jes Sorensen
 M:      jes@sgi.com
@@ -3121,6 +3112,15 @@ P:	Chris Zankel
 M:      chris@zankel.net
 S:      Maintained
 
+THINKPAD ACPI EXTRAS DRIVER
+P:      Henrique de Moraes Holschuh
+M:      ibm-acpi@hmh.eng.br
+L:      ibm-acpi-devel@lists.sourceforge.net
+W:      http://ibm-acpi.sourceforge.net
+W:      http://thinkwiki.org/wiki/Ibm-acpi
+T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
+S:      Maintained
+
 UltraSPARC (sparc64):
 P:      David S. Miller
 M:      davem@davemloft.net