diff options
author | James Morris <jmorris@namei.org> | 2012-02-09 16:40:31 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2012-02-09 16:40:31 +1100 |
commit | 2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (patch) | |
tree | 7fe91f4ddb6fc89a847d774747cab245929e32b6 /net/dns_resolver/dns_key.c | |
parent | d65b4e98d7ea3038b767b70fe8be959b2913f16d (diff) |
Merge branch 'linus-master'; commit 'v3.3-rc3' into next
Diffstat (limited to 'net/dns_resolver/dns_key.c')
0 files changed, 0 insertions, 0 deletions