diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /fs/gfs2/Kconfig | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/gfs2/Kconfig')
| -rw-r--r-- | fs/gfs2/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index 4dcddf83326f..a47b43107112 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig | |||
| @@ -8,7 +8,6 @@ config GFS2_FS | |||
| 8 | select FS_POSIX_ACL | 8 | select FS_POSIX_ACL |
| 9 | select CRC32 | 9 | select CRC32 |
| 10 | select SLOW_WORK | 10 | select SLOW_WORK |
| 11 | select QUOTA | ||
| 12 | select QUOTACTL | 11 | select QUOTACTL |
| 13 | help | 12 | help |
| 14 | A cluster filesystem. | 13 | A cluster filesystem. |