]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7f40cc a6b1533)
Merge remote-tracking branch 'dlm/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:58:44 +0000 (11:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:58:44 +0000 (11:58 +1100)
1  2 
fs/dlm/plock.c patch | diff1 | diff2 | blob | history

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