summaryrefslogtreecommitdiffstats
path: root/fs/dlm/lock.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2018-10-18 15:44:13 -0700
committerStephen Boyd <sboyd@kernel.org>2018-10-18 15:44:13 -0700
commit9a1d6b232bed2117fa9608873be044a5e8965e76 (patch)
tree3d2258cdb6bae7567287330c4243da41a393633c /fs/dlm/lock.c
parent1578968f77e6759afe4882dc20882639eacb2977 (diff)
parent52091c256bdcad0d01e2852a63f19cd2cce6af96 (diff)
parent82a4de6f11dc8ecf4ca8b9d207bcae6484b8f261 (diff)
downloadlinux-9a1d6b232bed2117fa9608873be044a5e8965e76.tar.bz2
Merge branches 'clk-fixed-rate-remove' and 'clk-qcom-cleanup' into clk-next
* clk-fixed-rate-remove: clk: fixed-rate: fix of_node_get-put imbalance * clk-qcom-cleanup: clk: qcom: Remove unused arrays in SDM845 GCC