Merge branch 'linus' into cpumask-for-linus

[pandora-kernel.git] / fs / reiserfs / procfs.c

diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index d4d7f14..d506640 100644 (file)
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -633,7 +633,7 @@ int reiserfs_global_version_in_proc(char *buffer, char **start,
  *
  */
 
-/* 
+/*
  * Make Linus happy.
  * Local variables:
  * c-indentation-style: "K&R"