diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-05 14:59:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-05 14:59:25 +0000 |
commit | 2a7509b187cab859cbc80e399e1d7c79c589d7ca (patch) | |
tree | 26038095a596a96b239e7b928989e6fc9cc7a3aa /fs/jbd2/recovery.c | |
parent | df3307126bd3a0935fd659966f64d2db8f5cdf32 (diff) | |
parent | d83aef13adfd893694be3f9b7decf167f963aa08 (diff) | |
parent | 050cf85c3f3913fa6cf678bd059a9e0e4c7621e5 (diff) | |
parent | ca0c37a0b489bb14bf3e1549e7a8d0c9a17f4919 (diff) | |
parent | ecea7484d2f76da1ce1eacdc7c25df08dab6fe78 (diff) | |
parent | c9889803e3ba635d4517cb9e366218c9895f8d24 (diff) | |
parent | 282179105d5403d991d2510ec74d1031695b3ef0 (diff) | |
download | linux-2a7509b187cab859cbc80e399e1d7c79c589d7ca.tar.bz2 |
Merge remote-tracking branches 'regulator/fix/max1586', 'regulator/fix/max77686', 'regulator/fix/max77693', 'regulator/fix/max77802', 'regulator/fix/max8860' and 'regulator/fix/s2mpa01' into regulator-linus