git.cascardo.info Git - cascardo/linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 3 Dec 2014 00:20:59 +0000 (16:20 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 3 Dec 2014 00:20:59 +0000 (16:20 -0800)
commit	deef2a118aed02aa9421e399056c82045e728282
tree	ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f	tree \| snapshot
parent	aa9d9be96d33d97488e1bdf13a144931a3fce08e	commit \| diff
parent	009d0431c3914de64666bec0d350e54fdd59df6a	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/exynos5250.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/core/rtw_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/core/rtw_wlan_util.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/usb_intf.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	diff1 \|	diff2 \|	blob \| history