Merge 3.15-rc2 into staging-next

This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.

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

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/goldfish/goldfish_audio.c
Simple merge

diff --cc drivers/staging/rtl8723au/core/rtw_wlan_util.c
Simple merge

diff --cc drivers/staging/vme/devices/vme_user.c
Simple merge