review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 32774ef a909d3e)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sun, 30 Oct 2016 10:38:44 +0000 (06:38 -0400)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Sun, 30 Oct 2016 10:38:44 +0000 (06:38 -0400)
commit	bdc065666a591fddc4e55cbdcd6c7b02f289b5ff
tree	acb92182d7c28a8d5176feb99fd7fb110a693ab7	tree \| snapshot
parent	32774ef3e4bb339cec19655946996a8c50063be4	commit \| diff
parent	a909d3e636995ba7c349e2ca5dbb528154d4ac30	commit \| diff

Merge 4.9-rc3 into staging-next

This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Domain: System / Kernel;