Merge branch 'for-linus' of git://neil.brown.name/md
[safe/jmp/linux-2.6] / Documentation / hwmon / acpi_power_meter
2009-09-19 Darrick J. Wonghwmon driver for ACPI 4.0 power meters