projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbf7a75 27b1142)
Merge 3.15 bugfixes for 3.16
authorJ. Bruce Fields <bfields@redhat.com>
Thu, 22 May 2014 19:48:11 +0000 (15:48 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Thu, 22 May 2014 19:48:15 +0000 (15:48 -0400)
1  2 
fs/nfsd/nfs4acl.c patch | diff1 | diff2 | blob | history
fs/nfsd/nfs4state.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/nfs4acl.c
Simple merge
diff --cc fs/nfsd/nfs4state.c
Simple merge
Domain: System / Kernel;