diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /net/netlabel/netlabel_domainhash.c | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'net/netlabel/netlabel_domainhash.c')
| -rw-r--r-- | net/netlabel/netlabel_domainhash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c index 7a10bbe02c1..c5d9f97ef21 100644 --- a/net/netlabel/netlabel_domainhash.c +++ b/net/netlabel/netlabel_domainhash.c @@ -682,7 +682,7 @@ struct netlbl_domaddr6_map *netlbl_domhsh_getentry_af6(const char *domain, * buckets and @skip_chain entries. For each entry in the table call * @callback, if @callback returns a negative value stop 'walking' through the * table and return. Updates the values in @skip_bkt and @skip_chain on - * return. Returns zero on succcess, negative values on failure. + * return. Returns zero on success, negative values on failure. * */ int netlbl_domhsh_walk(u32 *skip_bkt, |