Skip to content
Commit 6e997bb8 authored by Anton Vorontsov's avatar Anton Vorontsov
Browse files

Merge branch 'urgent' 

Conflicts:
	drivers/power/pm2301_charger.c
parents c6cc9fc9 92413a9b
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