]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 457cedb ee2bf98)
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 00:03:23 +0000 (11:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 00:03:23 +0000 (11:03 +1100)
1  2 
fs/nfs/nfs4proc.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/nfs4proc.c
Simple merge
Linux kernel for KaRo TX COM modules