]> 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: a255b0c 4369d32)
Merge remote-tracking branch 'nfs/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Oct 2012 00:18:58 +0000 (11:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Oct 2012 00:18:58 +0000 (11:18 +1100)
1  2 
fs/lockd/clntxdr.c patch | diff1 | diff2 | blob | history

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