diff --git a/[refs] b/[refs] index bcf6bc488fd0..76d07be7afa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d87e14c236d6c4cab66d87cf0bc1e0f0375d308 +refs/heads/master: 1c72d46d98e4eb16f1a1b38eba94cc3aa8022cfa diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4333b69e56bd..f384a9758fc0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2113,6 +2113,13 @@ M: perex@suse.cz L: alsa-devel@alsa-project.org S: Maintained +TPM DEVICE DRIVER +P: Kylene Hall +M: kjhall@us.ibm.com +W: http://tpmdd.sourceforge.net +L: tpmdd-devel@lists.sourceforge.net +S: Maintained + UltraSPARC (sparc64): P: David S. Miller M: davem@davemloft.net