Merge 3.14-rc4 into staging-next.

author Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Mon, 24 Feb 2014 20:33:52 +0000 (12:33 -0800)

committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Mon, 24 Feb 2014 20:33:52 +0000 (12:33 -0800)
author Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 20:33:52 +0000 (12:33 -0800)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2014 20:33:52 +0000 (12:33 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/staging/rtl8188eu/os_dep/os_intfs.c
Simple merge
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 24 Feb 2014 20:33:52 +0000 (12:33 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 24 Feb 2014 20:33:52 +0000 (12:33 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/os_intfs.c	patch \|	diff1 \|	diff2 \|	blob \| history