]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'psy-fixes' into psy-next
authorSebastian Reichel <sre@kernel.org>
Mon, 15 Apr 2019 20:40:29 +0000 (22:40 +0200)
committerSebastian Reichel <sre@kernel.org>
Mon, 15 Apr 2019 20:40:29 +0000 (22:40 +0200)
Merge fixes branch into next branch for cpcap-battery
patches.

Signed-off-by: Sebastian Reichel <sre@collabora.com>

Trivial merge