Merge git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...

* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging:
  staging: rt2860sta and rt2870sta: Remove drivers replaced in net/wireless

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
index 1d11306eee216644822e52b4969f0843b52663a3,dc642ab5974ea17b852e4d4088af31f79548ed1e..7d38925d585acc966157f3079229e9d113f49902
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -16,10 -16,7 +16,8 @@@ obj-$(CONFIG_USB_IP_COMMON)  += usbip
  obj-$(CONFIG_W35UND)          += winbond/
  obj-$(CONFIG_PRISM2_USB)      += wlan-ng/
  obj-$(CONFIG_ECHO)            += echo/
 -obj-$(CONFIG_BRCM80211)               += brcm80211/
 +obj-$(CONFIG_BRCMSMAC)                += brcm80211/
 +obj-$(CONFIG_BRCMFMAC)                += brcm80211/
- obj-$(CONFIG_RT2860)          += rt2860/
- obj-$(CONFIG_RT2870)          += rt2870/
  obj-$(CONFIG_COMEDI)          += comedi/
  obj-$(CONFIG_FB_OLPC_DCON)    += olpc_dcon/
  obj-$(CONFIG_ASUS_OLED)               += asus_oled/