diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-05 10:53:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-05 10:53:18 +0100 |
| commit | a65c86630632c534e9dd3cf76c1c5a5c98970873 (patch) | |
| tree | 386581ac1425454d457b84838ebaffa0e1a0c807 /fs/btrfs/async-thread.h | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
| parent | a8dbfeedfe47a19a4712749eb2444b1d7ea1150e (diff) | |
| parent | a4e2dec0d7479232df330dad60fd00ee94767381 (diff) | |
Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/tps65090' into regulator-linus