diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 18:44:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 18:44:56 +0200 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /fs/Kconfig | |
| parent | Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. (diff) | |
| download | linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip | |
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" source "fs/quota/Kconfig" -source "fs/autofs/Kconfig" source "fs/autofs4/Kconfig" source "fs/fuse/Kconfig" @@ -234,7 +233,6 @@ config NFS_COMMON default y source "net/sunrpc/Kconfig" -source "fs/smbfs/Kconfig" source "fs/ceph/Kconfig" source "fs/cifs/Kconfig" source "fs/ncpfs/Kconfig" |