diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-05 14:06:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-05 14:06:18 +0300 |
| commit | f291c74a32509d31731bb82cbb26c64cd430805b (patch) | |
| tree | c19a8a22880a48a4a4b6eb91ba1a30dd62427f5e /Documentation/sysctl/fs.txt | |
| parent | 8b7daad3da2b36f5fe494f5d0c5ef25b33d56b96 (diff) | |
| parent | 5e5e3a42c653c5ef1c281651f1882411601129bd (diff) | |
| download | linux-f291c74a32509d31731bb82cbb26c64cd430805b.tar.xz | |
Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-sky81452
Conflicts:
drivers/regulator/sky81452-regulator.c
Diffstat (limited to 'Documentation/sysctl/fs.txt')
0 files changed, 0 insertions, 0 deletions