diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-23 11:01:08 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-23 11:01:08 -0700 |
| commit | d86a2fe4dc97cbbad04f5db941d9a1bb82e22b5f (patch) | |
| tree | ebf731cd5d174397eb0306fb630df22fae57d12a /fs/proc/uptime.c | |
| parent | 312e0bce7f2d7fcf57f38f6e229a82eb4e0c2af4 (diff) | |
| parent | e4fba9b5be12d577d2e2c19fdca6b0744c3f271e (diff) | |
| parent | 921e54680aefe52f28d9ce9485edb1bfef4b92a8 (diff) | |
| parent | 8811191fdf7ed02ee07cb8469428158572d355a2 (diff) | |
| parent | 42617869bf095c650e67aad4001cab4224e7fa98 (diff) | |
| parent | 3a0e27d84bb9abac5e39dc71706768a88c72cb71 (diff) | |
| parent | f072f91aa7517386344476813ca0799e08fd0c35 (diff) | |
| download | linux-d86a2fe4dc97cbbad04f5db941d9a1bb82e22b5f.tar.bz2 | |
Merge remote-tracking branches 'asoc/fix/mtk', 'asoc/fix/psc', 'asoc/fix/pxa', 'asoc/fix/spear', 'asoc/fix/sti' and 'asoc/fix/wm0010' into asoc-linus