diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:28:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 12:28:24 -0400 |
| commit | 3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 (patch) | |
| tree | 07082b3239c24799e8aaf2e6a8a0ac059870d34a /MAINTAINERS | |
| parent | c4fd308ed62f292518363ea9c6c2adb3c2d95f9d (diff) | |
| parent | 4bd96a7a8185755b091233b16034c7436cbf57af (diff) | |
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, tboot: Add support for S3 memory integrity protection
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 28332e1b0863..3d2651bffadd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2953,6 +2953,17 @@ S: Odd Fixes | |||
| 2953 | F: Documentation/networking/README.ipw2200 | 2953 | F: Documentation/networking/README.ipw2200 |
| 2954 | F: drivers/net/wireless/ipw2x00/ipw2200.* | 2954 | F: drivers/net/wireless/ipw2x00/ipw2200.* |
| 2955 | 2955 | ||
| 2956 | INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) | ||
| 2957 | M: Joseph Cihula <joseph.cihula@intel.com> | ||
| 2958 | M: Shane Wang <shane.wang@intel.com> | ||
| 2959 | L: tboot-devel@lists.sourceforge.net | ||
| 2960 | W: http://tboot.sourceforge.net | ||
| 2961 | T: Mercurial http://www.bughost.org/repos.hg/tboot.hg | ||
| 2962 | S: Supported | ||
| 2963 | F: Documentation/intel_txt.txt | ||
| 2964 | F: include/linux/tboot.h | ||
| 2965 | F: arch/x86/kernel/tboot.c | ||
| 2966 | |||
| 2956 | INTEL WIRELESS WIMAX CONNECTION 2400 | 2967 | INTEL WIRELESS WIMAX CONNECTION 2400 |
| 2957 | M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> | 2968 | M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> |
| 2958 | M: linux-wimax@intel.com | 2969 | M: linux-wimax@intel.com |