FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 05:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4c1ac1b491
linux/drivers/char/tpm
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
Kconfig [PATCH] tpm: update module dependencies 2006-05-15 11:20:54 -07:00
Makefile [PATCH] tpm: driver for next generation TPM chips 2006-04-22 09:19:54 -07:00
tpm_atmel.c [PATCH] tpm: fix error handling 2006-10-11 11:14:22 -07:00
tpm_atmel.h [POWERPC] tmp_atmel: Constify & voidify get_property() 2006-07-31 15:55:06 +10:00
tpm_bios.c [PATCH] tpm: more bios log parsing fixes 2006-05-31 16:27:10 -07:00
tpm_infineon.c [PATCH] make more file_operation structs static 2006-07-03 15:26:59 -07:00
tpm_nsc.c [PATCH] tpm: fix error handling 2006-10-11 11:14:22 -07:00
tpm_tis.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
tpm.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
tpm.h [PATCH] tpm_register_hardware gcc 4.1 warning fix 2006-05-15 11:20:57 -07:00