diff --git a/[refs] b/[refs] index aa19b7a6b092..d514c8e21e1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4d1eb2ccecb76bce4c2125c5a3e77753fcfaeb0 +refs/heads/master: a93720eeb4b3bedc1fe15e4b6ca364e6be577d20 diff --git a/trunk/fs/sysfs/file.c b/trunk/fs/sysfs/file.c index 33bb3406dc49..16f39c30b091 100644 --- a/trunk/fs/sysfs/file.c +++ b/trunk/fs/sysfs/file.c @@ -335,7 +335,7 @@ static int sysfs_release(struct inode * inode, struct file * filp) * again will not get new data, or reset the state of 'poll'. * Reminder: this only works for attributes which actively support * it, and it is not possible to test an attribute from userspace - * to see if it supports poll (Nether 'poll' or 'select' return + * to see if it supports poll (Neither 'poll' nor 'select' return * an appropriate error code). When in doubt, set a suitable timeout value. */ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)