Linus Torvalds f063a0c0c9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
  Staging: brcm80211: fix usage of roundup in structures
  Staging: bcm: fix up network device reference counting
  Staging: keucr: fix up US_ macro change
  staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
  staging: brcm80211: Remove unnecessary header files.
  staging: brcm80211: Remove unnecessary includes from bcmutils.c
  staging: brcm80211: Removed unnecessary pktsetprio() function.
  Staging: brcm80211: remove typedefs.h
  Staging: brcm80211: remove uintptr typedef usage
  Staging: hv: remove struct vmbus_channel_interface
  Staging: hv: remove Open from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_open directly
  Staging: hv: netvsc: call vmbus_open directly
  Staging: hv: channel: export vmbus_open to modules
  Staging: hv: remove Close from struct vmbus_channel_interface
  Staging: hv: netvsc: call vmbus_close directly
  Staging: hv: storvsc: call vmbus_close directly
  Staging: hv: channel: export vmbus_close to modules
  Staging: hv: remove SendPacket from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_sendpacket directly
  ...

Fix up conflicts in
	drivers/staging/cx25821/cx25821-audio-upstream.c
	drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)

2010-10-28 12:13:00 -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

…

9p.txt

fs/9p: Add access = client option to opt in acl evaluation.

2010-10-28 09:08:46 -05: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

…

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

…

ceph.txt

Documentation/: it's -> its where appropriate

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

cifs.txt

…

coda.txt

…

cramfs.txt

…

debugfs.txt

…

dentry-locking.txt

…

devpts.txt

…

directory-locking

…

dlmfs.txt

Documentation/: it's -> its where appropriate

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

dnotify_test.c

…

dnotify.txt

…

ecryptfs.txt

…

exofs.txt

…

ext2.txt

…

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

…

fuse.txt

Documentation/: it's -> its where appropriate

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

gfs2-glocks.txt

…

gfs2-uevents.txt

…

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

…

mandatory-locking.txt

…

ncpfs.txt

…

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

…

relay.txt

…

romfs.txt

…

seq_file.txt

…

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

…

udf.txt

…

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

…