Greg Kroah-Hartman e4c5bf8e3d 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>

2010-10-28 09:44:56 -07:00

..

caching

fscache: convert object to use workqueue instead of slow-work

2010-07-22 22:58:34 +02:00

configfs

…

nfs

NFS: rename nfs.upcall -> nfs.idmap

2010-10-26 13:57:10 -04:00

pohmelfs

Staging: Pohmelfs: Added IO permissions and priorities.

2009-04-17 11:06:30 -07:00

9p.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

00-INDEX

smbfs: move to drivers/staging

2010-10-05 09:08:21 -07:00

adfs.txt

…

affs.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

afs.txt

AFS: Documentation updates

2009-08-19 10:40:13 -07:00

autofs4-mount-control.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

automount-support.txt

…

befs.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

bfs.txt

…

btrfs.txt

Btrfs: Add Documentation/filesystem/btrfs.txt, remove old COPYING

2009-01-07 09:54:24 -05:00

ceph.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

cifs.txt

…

coda.txt

…

cramfs.txt

…

debugfs.txt

Document the debugfs API

2009-06-06 10:28:14 -06:00

dentry-locking.txt

rcu: 1Q2010 update for RCU documentation

2010-01-16 10:25:22 +01:00

devpts.txt

Document usage of multiple-instances of devpts

2009-01-02 10:19:36 -08:00

directory-locking

…

dlmfs.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

dnotify_test.c

Documentation/fs/: split txt and source files

2010-03-12 15:52:35 -08:00

dnotify.txt

Documentation/fs/: split txt and source files

2010-03-12 15:52:35 -08:00

ecryptfs.txt

…

exofs.txt

trivial: some small fixes in exofs documentation

2009-12-10 09:59:16 +02:00

ext2.txt

Doc fix: ext2 can only have 32,000 subdirs, not 32,768

2009-06-18 13:03:44 -07:00

ext3.txt

ext3: make barrier options consistent with ext4

2010-05-21 19:30:41 +02:00

ext4.txt

ext4: add support for lazy inode table initialization

2010-10-27 21:30:05 -04:00

fiemap.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

files.txt

fix f_count description in Documentation/filesystems/files.txt

2008-12-31 18:07:42 -05:00

fuse.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

gfs2-glocks.txt

GFS2: Update docs

2009-05-19 10:23:23 +01:00

gfs2-uevents.txt

GFS2: Add a document explaining GFS2's uevents

2009-08-17 11:11:41 +01:00

gfs2.txt

GFS2: docs update

2010-03-29 14:28:52 +01:00

hfs.txt

…

hfsplus.txt

…

hpfs.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

inotify.txt

…

isofs.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

jfs.txt

…

Locking

update block_device_operations documentation

2010-10-25 21:18:22 -04:00

locks.txt

…

logfs.txt

fix "seperate" typos in comments

2010-05-10 11:56:30 +02:00

Makefile

Documentation/fs/: split txt and source files

2010-03-12 15:52:35 -08:00

mandatory-locking.txt

…

ncpfs.txt

ncpfs: remove dead URL from documentation

2009-09-23 07:39:42 -07:00

nilfs2.txt

nilfs2: add nodiscard mount option

2010-07-23 10:02:12 +09:00

ntfs.txt

…

ocfs2.txt

ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes.

2010-10-11 14:14:55 -07:00

omfs.txt

…

porting

update VFS documentation for method changes.

2010-08-09 16:48:40 -04:00

proc.txt

/proc/pid/pagemap: document in Documentation/filesystems/proc.txt

2010-10-27 18:03:13 -07:00

quota.txt

…

ramfs-rootfs-initramfs.txt

Trivial Documentation/filesystems/ramfs-rootfs-initramfs.txt fix

2008-11-30 11:40:56 -08:00

relay.txt

…

romfs.txt

…

seq_file.txt

seq_file: use proc_create() in documentation

2009-12-16 07:20:07 -08:00

sharedsubtree.txt

Documentation: Fix trivial typo in filesystems/sharedsubtree.txt

2010-10-25 21:18:21 -04:00

spufs.txt

…

squashfs.txt

Squashfs: update Kconfig and documentation for LZO

2010-08-05 23:42:54 +01:00

sysfs-pci.txt

PCI: Allow read/write access to sysfs I/O port resources

2010-07-30 09:32:08 -07:00

sysfs-tagging.txt

sysfs-namespaces: add a high-level Documentation file

2010-05-21 09:37:31 -07:00

sysfs.txt

sysfs: Fix one more signature discrepancy between sysfs implementation and docs.

2010-08-05 13:53:34 -07:00

sysv-fs.txt

…

tmpfs.txt

mempolicy: document cpuset interaction with tmpfs mpol mount option

2010-05-25 08:06:57 -07:00

ubifs.txt

UBIFS: remove fast unmounting

2009-01-29 16:34:30 +02:00

udf.txt

udf: implement mode and dmode mounting options

2009-04-02 12:29:50 +02:00

ufs.txt

…

vfat.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

vfs.txt

bkl: Remove locked .ioctl file operation

2010-08-14 00:24:24 +02:00

xfs-delayed-logging-design.txt

xfs: remove done roadmap item from xfs-delayed-logging-design.txt

2010-06-03 16:22:29 +10:00

xfs.txt

xfs: remove obsolete osyncisosync mount option

2010-07-26 13:16:51 -05:00

xip.txt

DOC: update xip method info

2008-11-12 17:17:17 -08:00