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

diff --cc MAINTAINERS
index 21116cc3b4a5bbb81ad4a426f04d382de439f5f0,cf643071fbc6eba18ec8f648901ce373574120b3,e3e1515ba5a9065308e588b5fa2e480bcd039132,e3e1515ba5a9065308e588b5fa2e480bcd039132,e3e1515ba5a9065308e588b5fa2e480bcd039132,b2afc7ae965bde912209daaceaff89ed6f1c7bb2..3bab239e82fe5f50427ee59eba95bd6dfe9346c2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/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

diff --cc drivers/pci/hotplug/Kconfig
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge