mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'linus' into release
Conflicts: arch/x86/kernel/cpu/cpufreq/longhaul.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
478c6a43fc
6737 changed files with 522676 additions and 237692 deletions
|
|
@ -83,7 +83,7 @@ static int bq27x00_read(u8 reg, int *rt_value, int b_single,
|
|||
}
|
||||
|
||||
/*
|
||||
* Return the battery temperature in Celcius degrees
|
||||
* Return the battery temperature in Celsius degrees
|
||||
* Or < 0 if something fails.
|
||||
*/
|
||||
static int bq27x00_battery_temperature(struct bq27x00_device_info *di)
|
||||
|
|
|
|||
Loading…
Reference in a new issue