diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-13 03:58:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 04:08:50 -0500 |
| commit | 61405fea92c42d072d9b8bd189689f1502a838af (patch) | |
| tree | 013ea3e7ed71f4114004d5852d40b6e89e128f76 /lib/string.c | |
| parent | 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b (diff) | |
| parent | 1703f2c321a8a531c393e137a82602e16c6061cb (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/string.c')
| -rw-r--r-- | lib/string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/string.c b/lib/string.c index afce96af3afd..9f75b4ec50b8 100644 --- a/lib/string.c +++ b/lib/string.c | |||
| @@ -338,10 +338,10 @@ EXPORT_SYMBOL(strnchr); | |||
| 338 | #endif | 338 | #endif |
| 339 | 339 | ||
| 340 | /** | 340 | /** |
| 341 | * skip_spaces - Removes leading whitespace from @s. | 341 | * skip_spaces - Removes leading whitespace from @str. |
| 342 | * @s: The string to be stripped. | 342 | * @str: The string to be stripped. |
| 343 | * | 343 | * |
| 344 | * Returns a pointer to the first non-whitespace character in @s. | 344 | * Returns a pointer to the first non-whitespace character in @str. |
| 345 | */ | 345 | */ |
| 346 | char *skip_spaces(const char *str) | 346 | char *skip_spaces(const char *str) |
| 347 | { | 347 | { |