Merge Linus's tree into staging-next

This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/brcm80211/brcmfmac/wl_iw.c
Simple merge

diff --cc drivers/staging/usbip/stub_rx.c
Simple merge