diff --git a/[refs] b/[refs] index 199ce81b7094..ebb0a1525bbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 341e262f903afbb8c23133ed6e193ea6254f73c4 +refs/heads/master: 2cd0a60cf49db4722445337b90fb06c9672f1128 diff --git a/trunk/fs/ubifs/file.c b/trunk/fs/ubifs/file.c index adce3b7b5a3e..5e7fccfc4b29 100644 --- a/trunk/fs/ubifs/file.c +++ b/trunk/fs/ubifs/file.c @@ -1541,7 +1541,6 @@ static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma) { int err; - /* 'generic_file_mmap()' takes care of NOMMU case */ err = generic_file_mmap(file, vma); if (err) return err;