| commit | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 03 15:48:01 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 03 15:48:01 2011 -0800 |
| tree | 3ed9d7b094e003a7b0d98234cb5b490d671bf3a9 | |
| parent | 4438a02fc4956f5f61918095708f183f5c63a9d3 [diff] | |
| parent | 1362fa078dae16776cd439791c6605b224ea6171 [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: DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]