git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Sep 2013 01:42:21 +0000 (18:42 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Sep 2013 01:42:21 +0000 (18:42 -0700)
commit	73b227771899acd0039a9634a3c367cfadd211c1
tree	f61f0ab5be4999d958c5bbf052089dcd29f04d3d	tree \| snapshot (tar.gz zip)
parent	b4e8459947e167f326795bf3dbc06c04b2a12d1d	commit \| diff
parent	15c03dd4859ab16f9212238f29dd315654aa94f6	commit \| diff

Merge 3.12-rc3 into staging-next

We want the staging fixes in here as well.

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

Motorola kernel-slsi

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/usb_intf.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/r819xU_cmdpkt.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/iwctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/rxtx.c	diff1 \|	diff2 \|	blob \| history