projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b06ae1e 154a96b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:29:43 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:29:43 +0000 (16:29 -0800)
commit069b6143378a17d44854619c1062393b361ebfe1
treeae86f4e053a690493aef048c6dc3f4bc7a5e3bectree | snapshot
parentb06ae1ead2915860bb49331e0588aab326801f71commit | diff
parent154a96bfcd53b8e5020718c64769e542c44788b9commit | 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:
  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
John Crispins staging tree