diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 12:32:54 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 12:32:54 (GMT) |
| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /drivers/hwmon/acpi_power_meter.c | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
| download | linux-fsl-qoriq-dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c.tar.xz | |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
Diffstat (limited to 'drivers/hwmon/acpi_power_meter.c')
0 files changed, 0 insertions, 0 deletions