| commit | 744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Jul 02 18:24:59 2012 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Jul 02 18:24:59 2012 +0100 |
| tree | e7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59 | |
| parent | f141822b15635daa94610c5527806fa315f59f4d [diff] | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 [diff] |
Merge tag 'v3.5-rc5' into regulator-drivers Linux 3.5-rc5 collides with further development. Conflicts: drivers/regulator/tps65023-regulator.c