Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 322943
b: refs/heads/master
c: e9b7d7c
h: refs/heads/master
i:
  322941: 7a4127f
  322939: d36b6be
  322935: 5f91368
  322927: a092dc4
  322911: 63e4645
  322879: ab2a7db
  322815: 377639e
v: v3
  • Loading branch information
Gang Wei authored and Linus Torvalds committed Sep 17, 2012
1 parent 4ac7350 commit 2fd8459
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 05cf96398e1b6502f9e191291b715c7463c9d5dd
refs/heads/master: e9b7d7c81d9bdb41a897a2983ae3386a5fd4a1e3
5 changes: 3 additions & 2 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3666,11 +3666,12 @@ F: Documentation/networking/README.ipw2200
F: drivers/net/wireless/ipw2x00/

INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
M: Joseph Cihula <joseph.cihula@intel.com>
M: Richard L Maliszewski <richard.l.maliszewski@intel.com>
M: Gang Wei <gang.wei@intel.com>
M: Shane Wang <shane.wang@intel.com>
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
Expand Down

0 comments on commit 2fd8459

Please sign in to comment.