]> 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: 21788f9 62e4a76)
Merge remote-tracking branch 'nfs/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:22:36 +0000 (10:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:22:36 +0000 (10:22 +1100)
1  2 
fs/nfs/pnfs.c patch | diff1 | diff2 | blob | history

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