]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 23:48:01 +0000 (15:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 23:48:01 +0000 (15:48 -0800)
commitf1d6e61a9cebd640264131dd1cb3cad5133ce8fe
tree3ed9d7b094e003a7b0d98234cb5b490d671bf3a9
parent251024b5ac62abc0554d786c18a37bf39d654c10
parent71dfd7b6fb47bbc45922fcc0d4ff9bfcbd16a73d
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:
  DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]