asedeno.scripts.mit.edu Git - linux.git/commit

author	Sebastian Reichel <sre@kernel.org>
	Mon, 15 Apr 2019 20:40:29 +0000 (22:40 +0200)
committer	Sebastian Reichel <sre@kernel.org>
	Mon, 15 Apr 2019 20:40:29 +0000 (22:40 +0200)
commit	6f76aa94e1d2f4e8758f65fd3ea08006303a1582
tree	462fac0be51ed72bcfdea28353b4e3bc9823324d	tree \| snapshot
parent	df68c44c720ae6415cb1f0c0d9a2e9893f3b1765	commit \| diff
parent	dbe7208c6c4aec083571f2ec742870a0d0edbea3	commit \| diff

Merge branch 'psy-fixes' into psy-next

Merge fixes branch into next branch for cpcap-battery
patches.

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