Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-10-28 09:44:56 -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: rt2860: remove custom min() and max()	2010-10-12 09:03:29 -07:00
iface	Staging: RT2860: Fixed all warnings and errors in the iface directory	2010-08-31 15:05:13 -07:00
sta	staging: rt2860: remove custom min() and max()	2010-10-12 09:03:29 -07:00
ap.h	Staging: RT2860: Fixed all warnings and errors in the iface directory	2010-08-31 15:05:13 -07:00
chlist.h	Staging: RT2860: Cleaned all bar one in chlist.h	2010-07-22 14:33:00 -07: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: RT2860: Fixed both coding style errors in eeprom.h	2010-08-31 11:53:20 -07:00
Kconfig	Staging: rt{2860,2870}sta: Use request_firmware() to load firmware	2010-03-03 16:42:48 -08:00
Makefile	Staging: rt2860: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:46 -07:00
mlme.h	Staging: RT2860 Fixed all errors in mlme.h and all but one in rtmp.h.	2010-06-22 14:43:05 -07:00
oid.h	Staging: RT2860: Fixed the spacing error in oid.h	2010-08-31 11:54:30 -07: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: rt2860: change plain format of mac address to %pM in *printf()	2010-09-16 12:26:10 -07:00
rt_linux.h	staging: rt2860: change plain format of mac address to %pM in *printf()	2010-09-16 12:26:10 -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_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
rtmp.h	staging: rt2860: remove custom min() and max()	2010-10-12 09:03:29 -07:00
rtusb_io.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
spectrum.h	Staging: rt28x0: remove typedefs (part three)	2009-12-11 12:23:16 -08:00
sta_ioctl.c	staging: rt2860: '&pointer[0]' to 'pointer' fix	2010-09-20 16:10:55 -07:00
TODO	Staging: rt2860: remove remainders of /etc reading stuff	2009-12-11 12:23:16 -08:00
usb_main_dev.c	Staging: rt2870sta: Add more device IDs from vendor drivers	2010-09-03 17:37:15 -07:00
wpa.h	Staging: rt28x0: remove typedefs (part three)	2009-12-11 12:23:16 -08:00