git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8f70e95 35124a0)

author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Thu, 24 Mar 2011 21:03:14 +0000 (17:03 -0400)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Thu, 24 Mar 2011 21:03:14 +0000 (17:03 -0400)
commit	0acd2201920d0968919f4f5797d63f7b6f2b19d4
tree	9b241d264f42eff3ff4eeffb67616fca0490e460	tree \| snapshot (tar.gz zip)
parent	8f70e95f9f4159184f557a1db60c909d7c1bd2e3	commit \| diff
parent	35124a0994fc02545b14b9fa3aad000b3331f1c0	commit \| diff

Merge branch 'nfs-for-2.6.39' into nfs-for-next

fs/nfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/getroot.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4_fs.h	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4xdr.c	diff1 \|	diff2 \|	blob \| history
include/linux/nfs4.h	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_xdr.h	diff1 \|	diff2 \|	blob \| history