Commit 069e79a0 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.17/battery-timer-fixes' into for-linus 

- avoid setting up battery timer for Apple and Magicmouse devices without
  battery (Aditya Garg)
parents 96ba894d 230cdd8a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment