android_kernel_xiaomi_sm8350/fs/nfs
Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2006-06-30 15:39:30 -07:00
..
callback_proc.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
callback_xdr.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
callback.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
callback.h
delegation.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
delegation.h
dir.c
direct.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
file.c [PATCH] mark address_space_operations const 2006-06-28 14:59:04 -07:00
idmap.c
inode.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
internal.h [PATCH] fix static linking of NFS 2006-06-27 14:07:19 -07:00
iostat.h
Makefile NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
mount_clnt.c
namespace.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs2xdr.c Fix NFS2 compile error 2006-06-25 12:30:33 -07:00
nfs3acl.c
nfs3proc.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs3xdr.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs4_fs.h
nfs4namespace.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs4proc.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
nfs4renewd.c
nfs4state.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
nfs4xdr.c NFSv4: A root pathname is sent as a zero component4 2006-06-09 09:34:30 -04:00
nfsroot.c
pagelist.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
proc.c NFS: Split fs/nfs/inode.c 2006-06-09 09:34:33 -04:00
read.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
super.c nfs-build-fix-99 2006-06-25 06:38:47 -04:00
symlink.c nfs: remove nfs_put_link() 2006-06-25 06:39:35 -04:00
sysctl.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
unlink.c
write.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00