diff options
author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:19:39 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:19:39 (GMT) |
commit | 10dde28d8682808e67b7ab39f08aa58adf502a25 (patch) | |
tree | a4041bf26a5285239a63a9845b9f4571b7279491 /fs/locks.c | |
parent | 6727479f07770df07d0058a396d19671a80d77f1 (diff) | |
parent | 8b7081442ee29b0de0bede6fcf7752b97159b581 (diff) | |
parent | 424fb281d6dff1c0fef2a402de3b3819b7a91a87 (diff) | |
download | linux-10dde28d8682808e67b7ab39f08aa58adf502a25.tar.xz |
Merge remote-tracking branches 'regulator/topic/da9053' and 'regulator/topic/da9063' into regulator-next