diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:44:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 12:44:56 -0400 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /fs/Kconfig | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 97673c955484..771f457402d4 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -62,7 +62,6 @@ source "fs/notify/Kconfig" | |||
| 62 | 62 | ||
| 63 | source "fs/quota/Kconfig" | 63 | source "fs/quota/Kconfig" |
| 64 | 64 | ||
| 65 | source "fs/autofs/Kconfig" | ||
| 66 | source "fs/autofs4/Kconfig" | 65 | source "fs/autofs4/Kconfig" |
| 67 | source "fs/fuse/Kconfig" | 66 | source "fs/fuse/Kconfig" |
| 68 | 67 | ||
| @@ -234,7 +233,6 @@ config NFS_COMMON | |||
| 234 | default y | 233 | default y |
| 235 | 234 | ||
| 236 | source "net/sunrpc/Kconfig" | 235 | source "net/sunrpc/Kconfig" |
| 237 | source "fs/smbfs/Kconfig" | ||
| 238 | source "fs/ceph/Kconfig" | 236 | source "fs/ceph/Kconfig" |
| 239 | source "fs/cifs/Kconfig" | 237 | source "fs/cifs/Kconfig" |
| 240 | source "fs/ncpfs/Kconfig" | 238 | source "fs/ncpfs/Kconfig" |