UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/staging/rt2860
History
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
..
chip Staging: rt2860: fix coding style issue in mac_pci.h, mac_usb.h, rtmp_mac.h, rtmp_phy.h 2010-05-11 11:35:42 -07:00
chips Staging: rt2860: fix coding style issue in rt3070.c, rt3090.c, rt30xx.c 2010-05-11 11:35:42 -07:00
common Staging: Drop memory allocation cast 2010-05-11 16:06:48 -07:00
iface USB: staging: fix up usb_buffer_alloc calls in the staging tree 2010-05-20 13:21:38 -07:00
sta Staging: drop redundant memset 2010-05-11 11:35:34 -07:00
Kconfig Staging: rt{2860,2870}sta: Use request_firmware() to load firmware 2010-03-03 16:42:48 -08:00
Makefile Staging: rt28x0: remove optional cmm profile parameters 2009-12-11 12:23:12 -08:00
TODO Staging: rt2860: remove remainders of /etc reading stuff 2009-12-11 12:23:16 -08:00
ap.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
chlist.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
crypt_hmac.h Staging: rt28x0: remove typedefs (part one) 2009-12-11 12:23:15 -08:00
crypt_md5.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
crypt_sha2.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
dfs.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
eeprom.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
mlme.h staging: trivial: fix typo "seperate" 2010-05-14 13:16:10 -07:00
oid.h Staging: rt2860: reduce superfluous exclamation marks 2009-12-11 12:23:19 -08:00
pci_main_dev.c Staging: rt2860: fixed coding-style issues in pci_main_dev.c 2010-05-11 11:35:34 -07:00
rt_config.h Staging: rt28x0: fix comments in *.h files 2009-12-11 12:23:15 -08:00
rt_linux.c Staging: Drop memory allocation cast 2010-05-11 16:06:48 -07:00
rt_linux.h Staging: rt28xx: Make PCI_{MAP,UNMAP}_SINGLE type-safe 2010-05-11 11:35:42 -07:00
rt_main_dev.c Staging: rt2860: fix coding style issue in rt_main_dev.c 2010-05-11 11:35:42 -07:00
rt_pci_rbus.c Staging: rt2860: fix coding style issue in rt_pci_rbus.c 2010-05-11 11:35:42 -07:00
rt_usb.c Staging: rt2860: fix coding style issue in rt_usb.c 2010-05-11 11:35:42 -07:00
rtmp.h Staging: rt2860: rtmp.h: Fixed all bar one error. 2010-05-11 11:35:42 -07:00
rtmp_chip.h Staging: rt2860: reduce superfluous exclamation marks 2009-12-11 12:23:19 -08:00
rtmp_ckipmic.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtmp_def.h Staging: rt2860: reduce superfluous exclamation marks 2009-12-11 12:23:19 -08:00
rtmp_dot11.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtmp_iface.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtmp_mcu.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtmp_os.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtmp_timer.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtmp_type.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
rtusb_io.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
spectrum.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
spectrum_def.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00
sta_ioctl.c Staging: drop redundant memset 2010-05-11 11:35:34 -07:00
usb_main_dev.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
wpa.h Staging: rt28x0: remove typedefs (part three) 2009-12-11 12:23:16 -08:00