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

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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b0fe8f7 c02ed2e)

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	1c816bad41fea5470e8077ae4e661f3f9b5ada64
tree	5e923d12b6284a711d66efee822ca48f95ebf1af	tree \| snapshot
parent	b0fe8f7b9b5adea2c85c72bba46e20fb21522769	commit \| diff
parent	c02ed2e75ef4c74e41e421acb4ef1494671585e8	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

local clone of linux.git