diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /lib/parser.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'lib/parser.c')
| -rw-r--r-- | lib/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/parser.c b/lib/parser.c index 6e89eca5cca0..dcbaaef6cf11 100644 --- a/lib/parser.c +++ b/lib/parser.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | /** | 14 | /** |
| 15 | * match_one: - Determines if a string matches a simple pattern | 15 | * match_one: - Determines if a string matches a simple pattern |
| 16 | * @s: the string to examine for presense of the pattern | 16 | * @s: the string to examine for presence of the pattern |
| 17 | * @p: the string containing the pattern | 17 | * @p: the string containing the pattern |
| 18 | * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match | 18 | * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match |
| 19 | * locations. | 19 | * locations. |