summaryrefslogtreecommitdiff
path: root/net/lapb/lapb_timer.c
diff options
context:
space:
mode:
authorSebastian Reichel <sebastian.reichel@collabora.com>2024-12-15 00:21:20 +0300
committerSebastian Reichel <sebastian.reichel@collabora.com>2024-12-15 00:21:20 +0300
commit2f9ccc64b3eeddab5690f56e59357c3a165d0cc6 (patch)
tree0be01af3bf856a6b7830e1370e599511ebcceea8 /net/lapb/lapb_timer.c
parent9d76d5de87bbf03c6e483565030b562dc42c7bff (diff)
parentc28dc9fc24f5fa802d44ef7620a511035bdd803e (diff)
downloadlinux-2f9ccc64b3eeddab5690f56e59357c3a165d0cc6.tar.xz
power: supply: Merge fixes branch into for-next
Merge the fixes branch into the development branch, since the it contains multiple changes to the cros_charge-control driver needed to convert it to the new power-supply extension framework. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions