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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 750b1a6 8a5776a)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 9 Oct 2017 07:02:35 +0000 (09:02 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 9 Oct 2017 07:02:35 +0000 (09:02 +0200)
commit	1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee
tree	47da3feee8e263e8c9352c85cf518e624be3c211	tree \| snapshot
parent	750b1a6894ecc9b178c6e3d0a1170122971b2036	commit \| diff
parent	8a5776a5f49812d29fe4b2d0a2d71675c3facf3f	commit \| diff

Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

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

18 files changed:

arch/arm/configs/pxa_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad7793.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ad_sigma_delta.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/mcp320x.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/stm32-adc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/ti-ads1015.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/twl4030-madc.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/industrialio-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/magnetometer/st_magn_core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/pressure/bmp280-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/trigger/stm32-timer-trigger.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/ad7192.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/pi433/rf69.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723bs/core/rtw_mlme.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/speakup/main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/unisys/visorbus/visorchipset.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;