From 2fd84590e7090678a53de9fda42cc7434eefd9d6 Mon Sep 17 00:00:00 2001 From: Gang Wei Date: Mon, 17 Sep 2012 14:08:59 -0700 Subject: [PATCH] --- yaml --- r: 322943 b: refs/heads/master c: e9b7d7c81d9bdb41a897a2983ae3386a5fd4a1e3 h: refs/heads/master i: 322941: 7a4127f205a7bec6564ff21d596d6f2611689635 322939: d36b6be38c6456cacc6cec185bdebdd04fcfb9fc 322935: 5f9136870731c05f2cfa2a795ad84737d628428c 322927: a092dc47e683ec1469dbd3e2518df7b427981926 322911: 63e4645b72137ab9b4111680692db9794af4ac39 322879: ab2a7db7989e4e783ca55b724027597c5956766e 322815: 377639e670cffbf9dd6357a14b18a7fdaeb9ee51 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31ada79ce8d1..c174a8a2d545 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05cf96398e1b6502f9e191291b715c7463c9d5dd +refs/heads/master: e9b7d7c81d9bdb41a897a2983ae3386a5fd4a1e3 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 53cc13c82cb1..b17587d9412f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3666,11 +3666,12 @@ F: Documentation/networking/README.ipw2200 F: drivers/net/wireless/ipw2x00/ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) -M: Joseph Cihula +M: Richard L Maliszewski +M: Gang Wei M: Shane Wang L: tboot-devel@lists.sourceforge.net W: http://tboot.sourceforge.net -T: Mercurial http://www.bughost.org/repos.hg/tboot.hg +T: hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot S: Supported F: Documentation/intel_txt.txt F: include/linux/tboot.h