Merge branches 'sony-laptop', 'bugzilla-14247' and 'bugzilla-14271' into release
[safe/jmp/linux-2.6] / drivers / acpi / power_meter.c
2009-09-19 Darrick J. Wonghwmon driver for ACPI 4.0 power meters