diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-02 19:24:59 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-02 19:24:59 +0200 |
| commit | 744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80 (patch) | |
| tree | e7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59 /drivers/thermal | |
| parent | regulator: fixed: support deferred probe for DT GPIOs (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80.tar.xz linux-744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80.zip | |
Merge tag 'v3.5-rc5' into regulator-drivers
Linux 3.5-rc5 collides with further development.
Conflicts:
drivers/regulator/tps65023-regulator.c
Diffstat (limited to 'drivers/thermal')
0 files changed, 0 insertions, 0 deletions