diff --git a/[refs] b/[refs] index e692ddbbdfb2..2fdce1d21331 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4e321b85a89d7cd392d3105b2c033a6c58ed337 +refs/heads/master: 4ca8a3c1b17cde8241eb9157484519427fa5bf91 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e3e1515ba5a9..21116cc3b4a5 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2656,6 +2656,14 @@ 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