linux/drivers/char/tpm
Rafael J. Wysocki 98feb7cc61 Merge branch 'acpi-cleanup'
* acpi-cleanup: (22 commits)
  ACPI / tables: Return proper error codes from acpi_table_parse() and fix comment.
  ACPI / tables: Check if id is NULL in acpi_table_parse()
  ACPI / proc: Include appropriate header file in proc.c
  ACPI / EC: Remove unused functions and add prototype declaration in internal.h
  ACPI / dock: Include appropriate header file in dock.c
  ACPI / PCI: Include appropriate header file in pci_link.c
  ACPI / PCI: Include appropriate header file in pci_slot.c
  ACPI / EC: Mark the function acpi_ec_add_debugfs() as static in ec_sys.c
  ACPI / NVS: Include appropriate header file in nvs.c
  ACPI / OSL: Mark the function acpi_table_checksum() as static
  ACPI / processor: initialize a variable to silence compiler warning
  ACPI / processor: use ACPI_COMPANION() to get ACPI device
  ACPI: correct minor typos
  ACPI / sleep: Drop redundant acpi_disabled check
  ACPI / dock: Drop redundant acpi_disabled check
  ACPI / table: Replace '1' with specific error return values
  ACPI: remove trailing whitespace
  ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
  ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
  SFI / ACPI: Fix warnings reported during builds with W=1
  ...

Conflicts:
	drivers/acpi/nvs.c
	drivers/hwmon/asus_atk0110.c
2014-01-12 23:44:09 +01:00
..
Kconfig tpm: use tabs instead of whitespaces in Kconfig 2013-10-22 19:43:12 +02:00
Makefile tpm: Add support for Atmel I2C TPMs 2013-10-22 19:43:07 +02:00
tpm_acpi.c ACPI: Clean up inclusions of ACPI header files 2013-12-07 01:03:14 +01:00
tpm_atmel.c tpm atmel: Call request_region with the correct base 2013-10-22 19:42:26 +02:00
tpm_atmel.h
tpm_eventlog.c tpm: Merge the tpm-bios module with tpm.o 2013-10-22 19:43:01 +02:00
tpm_eventlog.h drivers/char/tpm: Add securityfs support for event log 2012-08-22 16:22:47 -05:00
tpm_i2c_atmel.c tpm: Add support for Atmel I2C TPMs 2013-10-22 19:43:07 +02:00
tpm_i2c_infineon.c tpm: Remove tpm_show_caps_1_2 2013-10-22 19:42:41 +02:00
tpm_i2c_nuvoton.c tpm: Add support for the Nuvoton NPCT501 I2C TPM 2013-10-22 19:43:04 +02:00
tpm_i2c_stm_st33.c tpm: Remove tpm_show_caps_1_2 2013-10-22 19:42:41 +02:00
tpm_i2c_stm_st33.h tpm_i2c_stm_st33: fix oops when i2c client is unavailable 2013-02-05 09:38:24 -06:00
tpm_ibmvtpm.c tpm: Remove tpm_show_caps_1_2 2013-10-22 19:42:41 +02:00
tpm_ibmvtpm.h drivers/char/tpm: remove tasklet and cleanup 2012-11-01 15:23:14 -05:00
tpm_infineon.c Char/Misc driver merge for 3.8-rc1 2012-12-11 13:56:38 -08:00
tpm_nsc.c tpm: Fix cancellation of TPM commands (polling mode) 2013-02-05 09:38:24 -06:00
tpm_of.c drivers/char/tpm: Add securityfs support for event log 2012-08-22 16:22:47 -05:00
tpm_ppi.c Merge branch 'acpi-cleanup' 2014-01-12 23:44:09 +01:00
tpm_tis.c tpm: Remove tpm_show_caps_1_2 2013-10-22 19:42:41 +02:00
tpm-interface.c tpm: Rename tpm.c to tpm-interface.c 2013-10-22 19:42:51 +02:00
tpm.h tpm: Remove tpm_show_caps_1_2 2013-10-22 19:42:41 +02:00
xen-tpmfront.c Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 2013-11-21 19:46:00 -08:00