From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 2 Oct 2006 12:45:08 +0000 (-0400)
Subject: Merge branch 'master' into gfs2
X-Git-Tag: v2.6.19-rc1~32^2~12
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=59458f40e25915a355d8b1d701425fe9f4f9ea23

Merge branch 'master' into gfs2
---

59458f40e25915a355d8b1d701425fe9f4f9ea23
diff --cc fs/Kconfig
index c968b9c,1453d2d..fa64867
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@@ -1948,9 -1980,9 +1981,10 @@@ menu "Partition Types
  source "fs/partitions/Kconfig"
  
  endmenu
+ endif
  
  source "fs/nls/Kconfig"
 +source "fs/dlm/Kconfig"
  
  endmenu