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)
commitb65a0e0c84cf489bfa00d6aa6c48abc5a237100f
tree3ed9d7b094e003a7b0d98234cb5b490d671bf3a9
parent4438a02fc4956f5f61918095708f183f5c63a9d3
parent1362fa078dae16776cd439791c6605b224ea6171
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:
  DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]