git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2ad1d6f d67b700)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 Mar 2017 07:11:25 +0000 (09:11 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 Mar 2017 07:11:25 +0000 (09:11 +0200)
commit	8d5a49bd582806ceef1aba673cb88bbc52c7b0da
tree	5e923d12b6284a711d66efee822ca48f95ebf1af	tree \| snapshot
parent	2ad1d6fec2584b486f85f2985084898480f0c550	commit \| diff
parent	d67b700b03cdebbc883b94faeed994c96bd3efd6	commit \| diff

Merge 4.11-rc4 into staging-next

We need the IIO fixes in here as well to handle merge issues.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vc04_services/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.