commit c82ffab9a857f8286ed2b559624b7005a367b638
author Linus Torvalds <torvalds@linux-foundation.org> Wed Sep 23 15:18:57 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Sep 23 15:18:57 2009 -0700
tree a5d0895a0b55c2db1bf36f517ca273e7e0abdf71
parent a724eada8c2a7b62463b73ccf73fd0bb6e928aeb
parent 5224ee086321fec78970e2f2805892d2b34e8957

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* '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