diff options
author | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-01 17:25:06 (GMT) |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-01 17:25:06 (GMT) |
commit | 424c3d4a2c7d4ac3467a4849f8ccc230f670c35a (patch) | |
tree | 55806b1367b42ec210f273c16bf350182ac6fd62 /drivers/hwmon/acpi_power_meter.c | |
parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
parent | 88cda60e512373ca18a663ee66dc2550800223eb (diff) | |
download | linux-fsl-qoriq-424c3d4a2c7d4ac3467a4849f8ccc230f670c35a.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/hwmon/acpi_power_meter.c')
0 files changed, 0 insertions, 0 deletions