summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/00-INDEX
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 18:44:56 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 18:44:56 +0200
commite4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch)
treeea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /Documentation/filesystems/00-INDEX
parentMerge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentstaging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. (diff)
downloadlinux-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 'Documentation/filesystems/00-INDEX')
-rw-r--r--Documentation/filesystems/00-INDEX2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 4303614b5add..8c624a18f67d 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -96,8 +96,6 @@ seq_file.txt
- how to use the seq_file API
sharedsubtree.txt
- a description of shared subtrees for namespaces.
-smbfs.txt
- - info on using filesystems with the SMB protocol (Win 3.11 and NT).
spufs.txt
- info and mount options for the SPU filesystem used on Cell.
sysfs-pci.txt