diff --git a/[refs] b/[refs] index 9fc352feba9b..1ee9b99eeeb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 757be186129b674e3a0146a4bc1861ed0744cd95 +refs/heads/master: 855f46ad15d51e10081b13a5ce6fb36223cd2af5 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index bac3f706f75e..bd82e99a8c21 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2641,6 +2641,14 @@ M: dbrownell@users.sourceforge.net 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 + TPM DEVICE DRIVER P: Kylene Hall M: kjhall@us.ibm.com