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

diff --cc fs/dlm/plock.c
Simple merge