kernel-fxtec-pro1x/drivers/staging/rtl8192su
Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version
Conflicts:
	drivers/staging/arlan/arlan-main.c
	drivers/staging/comedi/drivers/cb_das16_cs.c
	drivers/staging/cx25821/cx25821-alsa.c
	drivers/staging/dt3155/dt3155_drv.c
	drivers/staging/hv/hv.c
	drivers/staging/netwave/netwave_cs.c
	drivers/staging/wavelan/wavelan.c
	drivers/staging/wavelan/wavelan_cs.c
	drivers/staging/wlags49_h2/wl_cs.c

This required a bit of hand merging due to the conflicts
that happened in the later .34-rc releases, as well as
some staging driver changing coming in through other trees
(v4l and pcmcia).

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-21 12:48:55 -07:00
..
ieee80211 Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
authors
Kconfig staging: rtl8192su: move to EEPROM_93CX 2010-05-11 11:35:32 -07:00
Makefile Staging: rtl819su: added r8192SU_led.c/.h 2010-05-14 13:54:55 -07:00
r819xU_cmdpkt.c Staging: rtl8192su: check for skb == NULL 2010-05-11 11:36:04 -07:00
r819xU_cmdpkt.h staging: rtl8192su: cleanup of r819xU_cmdpkt.c, r819xU_cmdpkt.c 2010-05-11 11:35:33 -07:00
r819xU_HTGen.h
r819xU_HTType.h Staging: rtl8192su: remove USB_TX_DRIVER_AGGREGATION_ENABLE ifdefs 2009-09-15 12:01:37 -07:00
r8192S_Efuse.c Staging: rtl8192su: remove dead code 2009-09-15 12:01:40 -07:00
r8192S_Efuse.h
r8192S_firmware.c Staging: rtl8192su: refactored FirmwareCheckReady 2010-05-11 11:36:04 -07:00
r8192S_firmware.h Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c 2010-03-03 16:43:04 -08:00
r8192S_hw.h Staging: rtl8192su: remove dead code 2009-09-15 12:01:40 -07:00
r8192S_phy.c staging: trivial: fix typo "seperate" 2010-05-14 13:16:10 -07:00
r8192S_phy.h Staging: rtl8192su: remove kernel version compatibility wrappers 2009-09-15 12:01:28 -07:00
r8192S_phyreg.h Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
r8192S_rtl6052.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
r8192S_rtl6052.h Staging: rtl8192su: remove dead code 2009-09-15 12:01:40 -07:00
r8192S_rtl8225.c
r8192S_rtl8225.h
r8192SU_HWImg.c Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c 2010-03-03 16:43:04 -08:00
r8192SU_HWImg.h Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c 2010-03-03 16:43:04 -08:00
r8192SU_led.c Staging: rtl819su: added r8192SU_led.c/.h 2010-05-14 13:54:55 -07:00
r8192SU_led.h Staging: rtl819su: added r8192SU_led.c/.h 2010-05-14 13:54:55 -07:00
r8192U.h Staging: rtl819su: added r8192SU_led.c/.h 2010-05-14 13:54:55 -07:00
r8192U_core.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
r8192U_dm.c Staging: rtl8187x: Use %pM for mac address output 2010-03-03 16:42:29 -08:00
r8192U_dm.h Staging: rtl8192su: remove dead code 2009-09-15 12:01:40 -07:00
r8192U_pm.c Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs 2009-09-15 12:01:37 -07:00
r8192U_pm.h Staging: rtl8192su: remove CONFIG_RTL8192_PM ifdefs 2009-09-15 12:01:37 -07:00
r8192U_wx.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
r8192U_wx.h Staging: rtl8192su: remove duplicate dot11d.h and ieee80211.h includes 2009-09-15 12:01:27 -07:00
TODO Staging: rtl8192su: use list_for_each_safe() in ieee80211_crypto_deinit 2010-03-03 16:43:05 -08:00