summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-20 16:29:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-20 16:29:43 -0800
commit069b6143378a17d44854619c1062393b361ebfe1 (patch)
treeae86f4e053a690493aef048c6dc3f4bc7a5e3bec /arch/x86
parentb06ae1ead2915860bb49331e0588aab326801f71 (diff)
parent154a96bfcd53b8e5020718c64769e542c44788b9 (diff)
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: trusted-keys: avoid scattring va_end() trusted-keys: check for NULL before using it trusted-keys: another free memory bugfix trusted-keys: free memory bugfix
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions