From: Linus Torvalds Date: Thu, 3 Mar 2011 23:48:01 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: v2.6.38-rc8~28 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b65a0e0c84cf489bfa00d6aa6c48abc5a237100f;p=~emulex%2Finfiniband.git 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] --- b65a0e0c84cf489bfa00d6aa6c48abc5a237100f