diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /drivers/char/tpm | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'drivers/char/tpm')
| -rw-r--r-- | drivers/char/tpm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm_infineon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 4dc338f3d1aa..f6595aba4f0f 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
| @@ -58,6 +58,6 @@ config TCG_INFINEON | |||
| 58 | To compile this driver as a module, choose M here; the module | 58 | To compile this driver as a module, choose M here; the module |
| 59 | will be called tpm_infineon. | 59 | will be called tpm_infineon. |
| 60 | Further information on this driver and the supported hardware | 60 | Further information on this driver and the supported hardware |
| 61 | can be found at http://www.prosec.rub.de/tpm | 61 | can be found at http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ |
| 62 | 62 | ||
| 63 | endif # TCG_TPM | 63 | endif # TCG_TPM |
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index f58440791e65..76da32e11f18 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> | 7 | * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com> |
| 8 | * Sirrix AG - security technologies, http://www.sirrix.com and | 8 | * Sirrix AG - security technologies, http://www.sirrix.com and |
| 9 | * Applied Data Security Group, Ruhr-University Bochum, Germany | 9 | * Applied Data Security Group, Ruhr-University Bochum, Germany |
| 10 | * Project-Homepage: http://www.prosec.rub.de/tpm | 10 | * Project-Homepage: http://www.trust.rub.de/projects/linux-device-driver-infineon-tpm/ |
| 11 | * | 11 | * |
| 12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
| 13 | * modify it under the terms of the GNU General Public License as | 13 | * modify it under the terms of the GNU General Public License as |