Merge branch 'master' into next

2026-11-13 07:31:07 +00:00 · 2009-06-09 09:27:53 +10:00 · 2009-06-09 09:27:53 +10:00 · 0b4ec6e4e0
commit 0b4ec6e4e0
parent 04288f4203 3af968e066
353 changed files with 12680 additions and 1547 deletions
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
--- a/fs/buffer.c
+++ b/fs/buffer.c
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c