James Morris d2e7ad1922 Merge branch 'master' into next ...

Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: James Morris <jmorris@namei.org>

2011-01-10 09:46:24 +11:00

..

Kconfig

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

Makefile

…

tpm_atmel.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

tpm_atmel.h

…

tpm_bios.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tpm_infineon.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

tpm_nsc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tpm_tis.c

tpm: Autodetect itpm devices

2010-11-30 09:18:01 +11:00

tpm.c

Merge branch 'master' into next

2011-01-10 09:46:24 +11:00

tpm.h

tpm: add module_put wrapper

2010-11-29 08:55:19 +11:00