git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 23 Sep 2009 22:18:57 +0000 (15:18 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 23 Sep 2009 22:18:57 +0000 (15:18 -0700)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: do not destroy the avc_cache_nodep
  KEYS: Have the garbage collector set its timer for live expired keys
  tpm-fixup-pcrs-sysfs-file-update
  creds_are_invalid() needs to be exported for use by modules:
  include/linux/cred.h: fix build

Fix trivial BUILD_BUG_ON-induced conflicts in drivers/char/tpm/tpm.c

		1	2
drivers/char/tpm/tpm.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge