]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
projects / people / arne_f / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c862399 8fcd461)
Merge branch 'for-4.2' into for-4.3
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Aug 2015 20:16:03 +0000 (16:16 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Aug 2015 20:16:03 +0000 (16:16 -0400)
1  2 
fs/nfsd/nfs4state.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/nfs4state.c
Simple merge
Arne's tree of linux kernel.