diff options
author | David Woodhouse | 2007-08-23 11:43:14 +0200 |
---|---|---|
committer | David Woodhouse | 2007-08-23 11:43:14 +0200 |
commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /drivers/char/tpm/tpm_atmel.h | |
parent | [MTD] mtdoops printk warning fixes (diff) | |
parent | Apply memory policies to top two highest zones when highest zone is ZONE_MOVABLE (diff) | |
download | kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.gz kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.xz kernel-qcow2-linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/tpm/tpm_atmel.h')
-rw-r--r-- | drivers/char/tpm/tpm_atmel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h index 9363bcf0a402..6c831f9466b7 100644 --- a/drivers/char/tpm/tpm_atmel.h +++ b/drivers/char/tpm/tpm_atmel.h @@ -4,7 +4,7 @@ * Authors: * Kylene Hall <kjhall@us.ibm.com> * - * Maintained by: <tpmdd_devel@lists.sourceforge.net> + * Maintained by: <tpmdd-devel@lists.sourceforge.net> * * Device driver for TCG/TCPA TPM (trusted platform module). * Specifications at www.trustedcomputinggroup.org |