diff options
author | Joel Becker <joel.becker@oracle.com> | 2010-05-18 23:40:42 (GMT) |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-05-18 23:40:42 (GMT) |
commit | 41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1 (patch) | |
tree | 89eddf2dffadbbd13939f94eb8cd904a26279390 /fs/nfs/dns_resolve.h | |
parent | 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd (diff) | |
parent | 1a934c3e57594588c373aea858e4593cdfcba4f4 (diff) | |
download | linux-41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1.tar.xz |
Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window
Diffstat (limited to 'fs/nfs/dns_resolve.h')
0 files changed, 0 insertions, 0 deletions