Merge 3.12-rc3 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/staging/rtl8192u/r819xU_cmdpkt.c
Simple merge

diff --cc drivers/staging/vt6656/iwctl.c
Simple merge

diff --cc drivers/staging/vt6656/rxtx.c
Simple merge