- tpm-add-intel-tpm-tis-device-hid.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     tpm: add Intel TPM TIS device HID
has been removed from the -mm tree.  Its filename was
     tpm-add-intel-tpm-tis-device-hid.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: tpm: add Intel TPM TIS device HID
From: Marcin Obara <marcin_obara@xxxxxxxxxxxxxxxxxxxxx>

This patch adds Intel TPM TIS device HID:  ICO0102

Signed-off-by: Marcin Obara <marcin_obara@xxxxxxxxxxxxxxxxxxxxx>
Acked-by: Marcel Selhorst <tpm@xxxxxxxxxxxx>
Acked-by: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/char/tpm/tpm_tis.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/char/tpm/tpm_tis.c~tpm-add-intel-tpm-tis-device-hid drivers/char/tpm/tpm_tis.c
--- a/drivers/char/tpm/tpm_tis.c~tpm-add-intel-tpm-tis-device-hid
+++ a/drivers/char/tpm/tpm_tis.c
@@ -623,6 +623,7 @@ static struct pnp_device_id tpm_pnp_tbl[
 	{"IFX0102", 0},		/* Infineon */
 	{"BCM0101", 0},		/* Broadcom */
 	{"NSC1200", 0},		/* National */
+	{"ICO0102", 0},		/* Intel */
 	/* Add new here */
 	{"", 0},		/* User Specified */
 	{"", 0}			/* Terminator */
_

Patches currently in -mm which might be from marcin_obara@xxxxxxxxxxxxxxxxxxxxx are

origin.patch
tpm-correct-tpm-timeouts-to-jiffies-conversion.patch
tpm-increase-size-of-internal-tpm-response-buffers.patch
tpm-increase-size-of-internal-tpm-response-buffers-checkpatch-fixes.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux