summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLinus Torvalds2014-12-11 01:02:12 +0100
committerLinus Torvalds2014-12-11 01:02:12 +0100
commit8322b6fddfd2cee41a7732284e5f04750511f4b2 (patch)
treeebff5f6c0d43aa82c7e36cfb5cfd40be050db8a2 /drivers/i2c
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
parentdlm: adopt orphan locks (diff)
downloadkernel-qcow2-linux-8322b6fddfd2cee41a7732284e5f04750511f4b2.tar.gz
kernel-qcow2-linux-8322b6fddfd2cee41a7732284e5f04750511f4b2.tar.xz
kernel-qcow2-linux-8322b6fddfd2cee41a7732284e5f04750511f4b2.zip
Merge tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm update from David Teigland: "This set includes one feature, which allows locks that have been orphaned to be reacquired" * tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: adopt orphan locks
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions