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)
commit5c46ad47e9be97f788f12f4ebef961c54bb2f06a
tree6e74c4e144d17e283151169c12d895d389272858
parentd7f40cc754bf479cca4a0f607b173efd4e6c805a
parenta6b1533e9a57d76cd3d9b7649d29ac604b1874b8
Merge remote-tracking branch 'dlm/next'
fs/dlm/plock.c