Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/string.c b/lib/string.c
index 63077267367e..a485d75962af 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -320,7 +320,7 @@ char *strstrip(char *s)
                 return s;
 
         end = s + size - 1;
-        while (end != s && isspace(*end))
+        while (end >= s && isspace(*end))
                 end--;
         *(end + 1) = '\0';