Merge f9ae180416 ("Merge tag 'for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline

Steps on the way to 6.7-rc1

Change-Id: Iae7da0e2896ffd72e214d44b4453218c90abdf75
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-11-29 10:08:13 +00:00
361 changed files with 21863 additions and 2330 deletions
-1
View File
@@ -772,7 +772,6 @@ struct power_supply_battery_info {
int bti_resistance_tolerance;
};
extern struct atomic_notifier_head power_supply_notifier;
extern int power_supply_reg_notifier(struct notifier_block *nb);
extern void power_supply_unreg_notifier(struct notifier_block *nb);
#if IS_ENABLED(CONFIG_POWER_SUPPLY)