From: Len Brown <len.brown@intel.com>
Date: Mon, 21 Aug 2006 01:49:29 +0000 (-0400)
Subject: Merge trivial low-risk suspend hotkey bugzilla-5918 into release
X-Git-Tag: v2.6.18-rc5~75
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da547d775fa9ba8d9dcaee7bc4e960540e2be576;p=linux-2.6

Merge trivial low-risk suspend hotkey bugzilla-5918 into release
---

da547d775fa9ba8d9dcaee7bc4e960540e2be576
diff --cc MAINTAINERS
index 21116cc3b4,cf643071fb,e3e1515ba5,e3e1515ba5,e3e1515ba5,b2afc7ae96..3bab239e82
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -2648,22 -2624,6 -2648,14 -2648,14 -2648,14 -2626,6 +2654,22 @@@@@@@ M:	dbrownell@users.sourceforge.ne
      L:	spi-devel-general@lists.sourceforge.net
      S:	Maintained
      
 +   +STABLE BRANCH:
 +   +P:	Greg Kroah-Hartman
 +   +M:	greg@kroah.com
 +   +P:	Chris Wright
 +   +M:	chrisw@sous-sol.org
 +   +L:	stable@kernel.org
 +   +S:	Maintained
 +   +
 +++++STABLE BRANCH:
 +++++P:	Greg Kroah-Hartman
 +++++M:	greg@kroah.com
 +++++P:	Chris Wright
 +++++M:	chrisw@sous-sol.org
 +++++L:	stable@kernel.org
 +++++S:	Maintained
 +++++
      TPM DEVICE DRIVER
      P:	Kylene Hall
      M:	kjhall@us.ibm.com