From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 23:45:32 +0000 (+0000)
Subject: - sync fedora branch
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~108
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=51d8f8199067a509e1b89c72b7a3998f48dc25a4;p=linux-2.6.git

- sync fedora branch
---

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 8ba19ad4f..e530c6c09 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -135,8 +135,8 @@ struct zone {
 
 	/* Fields commonly accessed by the page reclaim scanner */
 	spinlock_t		lru_lock;	
- 	struct list_head	active_list;
- 	struct list_head	inactive_list;
+	struct list_head	active_list;
+	struct list_head	inactive_list;
 	unsigned long		nr_scan_active;
 	unsigned long		nr_scan_inactive;
 	unsigned long		nr_active;
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 8e6b4a7d6..8592644c8 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -467,6 +467,7 @@ enum reiserfs_mount_options {
     REISERFS_ERROR_PANIC,
     REISERFS_ERROR_RO,
     REISERFS_ERROR_CONTINUE,
+
     REISERFS_TEST1,
     REISERFS_TEST2,
     REISERFS_TEST3,