Merge 3.12-rc3 into staging-next
commit73b227771899acd0039a9634a3c367cfadd211c1
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:42:21 +0000 (29 18:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:42:21 +0000 (29 18:42 -0700)
treef61f0ab5be4999d958c5bbf052089dcd29f04d3d
parentb4e8459947e167f326795bf3dbc06c04b2a12d1d
parent15c03dd4859ab16f9212238f29dd315654aa94f6
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>
MAINTAINERS
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
drivers/staging/rtl8188eu/os_dep/usb_intf.c
drivers/staging/rtl8192u/r819xU_cmdpkt.c
drivers/staging/vt6656/iwctl.c
drivers/staging/vt6656/rxtx.c