Merge branch 'upstream' into for-linus
[safe/jmp/linux-2.6] / Documentation / intel_txt.txt
2010-03-19 Shane Wangx86, tboot: Add support for S3 memory integrity protection
2009-07-21 Joseph Cihulax86, intel_txt: Intel TXT boot support