linux/fs/nfs
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
objlayout NFSv4.1: Fix some issues with pnfs_generic_pg_test 2011-06-21 11:54:05 -04:00
cache_lib.c switch vfs_path_lookup() to struct path 2011-07-20 01:44:14 -04:00
cache_lib.h
callback_proc.c
callback_xdr.c
callback.c
callback.h
client.c
delegation.c
delegation.h
dir.c fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers 2011-07-20 20:47:59 -04:00
direct.c nfs_open_context doesn't need struct path either 2011-07-20 01:43:44 -04:00
dns_resolve.c
dns_resolve.h
file.c fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers 2011-07-20 20:47:59 -04:00
fscache-index.c
fscache.c FS-Cache: Add a helper to bulk uncache pages on an inode 2011-07-07 13:21:56 -07:00
fscache.h
getroot.c
idmap.c treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
inode.c nfs_open_context doesn't need struct path either 2011-07-20 01:43:44 -04:00
internal.h NFSv4.1: allow nfs_fhget to succeed with mounted on fileid 2011-06-15 11:24:29 -04:00
iostat.h
Kconfig
Makefile
mount_clnt.c
namespace.c
nfs2xdr.c
nfs3acl.c kill boilerplates around posix_acl_create_masq() 2011-07-25 14:27:32 -04:00
nfs3proc.c
nfs3xdr.c
nfs4_fs.h nfs4_closedata doesn't need to mess with struct path 2011-07-20 01:43:41 -04:00
nfs4filelayout.c pnfs: write: Set mds_offset in the generic layer - it is needed by all LDs 2011-06-28 14:12:11 -04:00
nfs4filelayout.h
nfs4filelayoutdev.c
nfs4namespace.c
nfs4proc.c nfs_open_context doesn't need struct path either 2011-07-20 01:43:44 -04:00
nfs4renewd.c
nfs4state.c nfs4_closedata doesn't need to mess with struct path 2011-07-20 01:43:41 -04:00
nfs4xdr.c NFSv4.1: update nfs4_fattr_bitmap_maxsz 2011-07-11 19:14:38 -04:00
nfsroot.c
pagelist.c nfs_open_context doesn't need struct path either 2011-07-20 01:43:44 -04:00
pnfs_dev.c NFSv4.1: Fix a refcounting issue in the pNFS device id cache 2011-06-15 11:24:29 -04:00
pnfs.c NFSv4.1: Fix an off-by-one error in pnfs_generic_pg_test 2011-06-21 11:54:06 -04:00
pnfs.h NFS: fix umount of pnfs filesystems 2011-06-15 11:23:02 -04:00
proc.c
read.c nfs_open_context doesn't need struct path either 2011-07-20 01:43:44 -04:00
super.c switch vfs_path_lookup() to struct path 2011-07-20 01:44:14 -04:00
symlink.c
sysctl.c
unlink.c
write.c nfs_open_context doesn't need struct path either 2011-07-20 01:43:44 -04:00