From be92bd640a544957e874306216976339b3b182ec Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 3 Aug 2006 12:28:11 -0400 Subject: [PATCH] --- yaml --- r: 33327 b: refs/heads/master c: 4ca8a3c1b17cde8241eb9157484519427fa5bf91 h: refs/heads/master i: 33325: 866952cc6db3f94981f25005204146e3ddb71564 33323: a25a16abcdd814ef7caec5d1361efb3c6f4b824a 33319: 8092523e6cdf8e1d3748aa2f7dd67bd37630ecbf 33311: 1a11e57e4a2e447e597b3aa1d1df9b48fcd41a36 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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