linux/fs/nfsd
Linus Torvalds 98793265b4 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: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
acl.h
auth.c
auth.h
cache.h
export.c NFSD: Remove the ex_pathname field from struct svc_export 2011-09-13 22:44:10 -04:00
idmap.h
Kconfig
lockd.c
Makefile
nfs2acl.c
nfs3acl.c
nfs3proc.c
nfs3xdr.c
nfs4acl.c fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros 2011-10-31 19:30:31 -04:00
nfs4callback.c nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalid 2011-10-24 04:24:27 -04:00
nfs4idmap.c
nfs4proc.c new helpers: fh_{want,drop}_write() 2012-01-03 22:52:35 -05:00
nfs4recover.c vfs: mnt_drop_write_file() 2012-01-03 22:52:40 -05:00
nfs4state.c treewide: Fix typos in various parts of the kernel, and fix some comments. 2011-12-02 14:57:31 +01:00
nfs4xdr.c nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access 2011-11-01 18:06:43 -04:00
nfscache.c
nfsctl.c vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb 2012-01-06 23:16:53 -05:00
nfsd.h NFSD: Add a cache for fs_locations information 2011-09-13 22:44:17 -04:00
nfsfh.c fs: propagate umode_t, misc bits 2012-01-03 22:55:10 -05:00
nfsfh.h fs: propagate umode_t, misc bits 2012-01-03 22:55:10 -05:00
nfsproc.c
nfssvc.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
nfsxdr.c
state.h nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalid 2011-10-24 04:24:27 -04:00
stats.c
vfs.c fs: propagate umode_t, misc bits 2012-01-03 22:55:10 -05:00
vfs.h fs: propagate umode_t, misc bits 2012-01-03 22:55:10 -05:00
xdr3.h
xdr4.h nfs41: implement DESTROY_CLIENTID operation 2011-10-24 04:24:30 -04:00
xdr.h