projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a724ead 5224ee0)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 22:18:57 +0000 (15:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 22:18:57 +0000 (15:18 -0700)
commitc82ffab9a857f8286ed2b559624b7005a367b638
treea5d0895a0b55c2db1bf36f517ca273e7e0abdf71tree | snapshot
parenta724eada8c2a7b62463b73ccf73fd0bb6e928aebcommit | diff
parent5224ee086321fec78970e2f2805892d2b34e8957commit | diff
Merge branch 'for-linus' of git://git./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
drivers/char/tpm/tpm.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;