Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown <len.brown@intel.com> |
||
|---|---|---|
| .. | ||
| apm_power.c | ||
| bq27x00_battery.c | ||
| da9030_battery.c | ||
| ds2760_battery.c | ||
| Kconfig | ||
| Makefile | ||
| olpc_battery.c | ||
| pcf50633-charger.c | ||
| pda_power.c | ||
| pmu_battery.c | ||
| power_supply_core.c | ||
| power_supply_leds.c | ||
| power_supply_sysfs.c | ||
| power_supply.h | ||
| tosa_battery.c | ||
| wm97xx_battery.c | ||
| wm8350_power.c | ||