| commit | 069b6143378a17d44854619c1062393b361ebfe1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 20 16:29:43 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 20 16:29:43 2011 -0800 |
| tree | ae86f4e053a690493aef048c6dc3f4bc7a5e3bec | |
| parent | b06ae1ead2915860bb49331e0588aab326801f71 [diff] | |
| parent | 154a96bfcd53b8e5020718c64769e542c44788b9 [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