diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-06 21:10:30 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-06 21:10:30 +0000 |
commit | b5dabc8d3b8442df78af9036ac5477770228ebe3 (patch) | |
tree | dfe554c4d8a608f6ff1a1ffdfa36177f4d61a858 /fs/jbd | |
parent | 90bc29347df64c2482fb28983857b87da2ce7094 (diff) | |
parent | 4d9cbff5aae65880e3d1e44357924fafc8d8bea0 (diff) | |
parent | 28249b0c2fa361cdac450a6f40242ed45408a24f (diff) | |
download | linux-b5dabc8d3b8442df78af9036ac5477770228ebe3.tar.gz linux-b5dabc8d3b8442df78af9036ac5477770228ebe3.tar.bz2 linux-b5dabc8d3b8442df78af9036ac5477770228ebe3.zip |
Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into regulator-linus