Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/rtl8821ae/core.c

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/driver-model/devres.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/staging/android/binder.c
Simple merge

diff --cc drivers/staging/et131x/et131x.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-hdmi.c
Simple merge

diff --cc drivers/staging/imx-drm/parallel-display.c
Simple merge

diff --cc drivers/staging/lustre/lustre/lclient/lcommon_cl.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/file.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/llite_internal.h
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/lloop.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/rw.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/rw26.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/vvp_io.c
Simple merge

diff --cc drivers/staging/netlogic/xlr_net.c
Simple merge

diff --cc drivers/staging/rtl8821ae/core.c
Simple merge

diff --cc include/linux/device.h
Simple merge