From f60152cacdba6daffa1507059e3baa925d065b91 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Sun, 24 Apr 2011 15:35:11 +0300
Subject: [PATCH] --- yaml --- r: 250431 b: refs/heads/master c:
 2cd0a60cf49db4722445337b90fb06c9672f1128 h: refs/heads/master i:   250429:
 58cd6871a735d7b70ecc4d2fbcee1e41ba2ded05   250427:
 78ee9139f741f64d6dd5426a39107990defad982   250423:
 2d85ecf7b0da12185f35d8b75a07eab651a30539   250415:
 3b0f4bf329e9ebd38f278fad2edc2144421bc503   250399:
 68f4b7e41936a21ca50a61096e420a359fe5f932   250367:
 e7aa42553260ac18cf40b878b4f512968961f5ac v: v3

---
 [refs]                | 2 +-
 trunk/fs/ubifs/file.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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;