projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ca310f fdb63dc)
Merge branch 'devel' into linux-next
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 17 Mar 2014 19:15:21 +0000 (15:15 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 17 Mar 2014 19:15:21 +0000 (15:15 -0400)
1  2 
fs/nfs/internal.h patch | diff1 | diff2 | blob | history
fs/nfs/nfs4proc.c patch | diff1 | diff2 | blob | history
fs/nfs/nfs4state.c patch | diff1 | diff2 | blob | history
include/linux/nfs_xdr.h patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/internal.h
Simple merge
diff --cc fs/nfs/nfs4proc.c
Simple merge
diff --cc fs/nfs/nfs4state.c
Simple merge
diff --cc include/linux/nfs_xdr.h
Simple merge