Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik
2006-08-19 17:25:47 -04:00
154 changed files with 2010 additions and 795 deletions
+8
View File
@@ -2674,6 +2674,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