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

This commit is contained in:
David S. Miller
2008-04-03 14:33:42 -07:00
613 changed files with 11364 additions and 7842 deletions

View File

@ -57,7 +57,7 @@ int kobject_action_type(const char *buf, size_t count,
enum kobject_action action;
int ret = -EINVAL;
if (count && buf[count-1] == '\n')
if (count && (buf[count-1] == '\n' || buf[count-1] == '\0'))
count--;
if (!count)