[GFS2] Fix up merge of Linus' kernel into GFS2

This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Conflicts:

	include/linux/Kbuild
	include/linux/kernel.h

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index ddc7462ddb56..ca9affd676ae 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -326,8 +326,8 @@ source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 
 config OCFS2_FS
-        tristate "OCFS2 file system support (EXPERIMENTAL)"
-        depends on NET && SYSFS && EXPERIMENTAL
+        tristate "OCFS2 file system support"
+        depends on NET && SYSFS
         select CONFIGFS_FS
         select JBD
         select CRC32
@@ -1472,8 +1472,8 @@ config NFS_V4
           If unsure, say N.
 
 config NFS_DIRECTIO
-        bool "Allow direct I/O on NFS files (EXPERIMENTAL)"
-        depends on NFS_FS && EXPERIMENTAL
+        bool "Allow direct I/O on NFS files"
+        depends on NFS_FS
         help
           This option enables applications to perform uncached I/O on files
           in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT