Merge 3.18-rc7 into staging-work.

We want those staging fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/exynos5250.dtsi
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_cmd.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
Simple merge

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

diff --cc drivers/staging/rtl8188eu/os_dep/usb_intf.c
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge