Greg Kroah-Hartman 949c3676cd Staging: Merge branch 'staging-next' into 2.6.38-rc3 ... This was done to resolve conflicts in the following files due to patches in Linus's tree and in the staging-next tree: drivers/staging/brcm80211/brcmsmac/wl_mac80211.c drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-02-02 13:35:58 -08:00
..
chip	Staging: rt2860: Sanitize DBGPRINT_ERR macro	2010-12-16 12:17:29 -08:00
chips	Staging: rt2860: fix previous patch error	2010-12-09 16:15:41 -08:00
common	Staging: rt2860: Sanitize DBGPRINT_ERR macro	2010-12-16 12:17:29 -08:00
iface
sta	Staging: rt2860: Sanitize DBGPRINT_ERR macro	2010-12-16 12:17:29 -08:00
ap.h
chlist.h
crypt_hmac.h
crypt_md5.h
crypt_sha2.h
dfs.h
eeprom.h
Kconfig
Makefile
mlme.h	staging: Fix typos in rt2860	2010-11-09 16:43:01 -08:00
oid.h	Staging: rt2860: Clean spaces before tabs	2010-12-13 10:28:41 -08:00
pci_main_dev.c	Staging: rt2860: include KERN_* in printk	2010-12-16 12:17:28 -08:00
rt_config.h
rt_linux.c	Staging: rt2860: rt_linux.c: Fix space after unary '*' operator.	2011-01-25 18:03:26 +08:00
rt_linux.h	Staging: rt2860: rt_linux.h: Fix space after unary '*' operator.	2011-01-25 18:03:26 +08:00
rt_main_dev.c	staging: rt2860: Fix incorrect netif_stop_queue usage warning	2011-01-20 12:06:06 -08:00
rt_pci_rbus.c	staging: Fix typos in rt2860	2010-11-09 16:43:01 -08:00
rt_usb.c	Staging: rt2860: include KERN_* in printk	2010-12-16 12:17:28 -08:00
rtmp.h	drivers/staging: Remove unnecessary semicolons	2010-11-16 12:06:47 -08:00
rtmp_chip.h
rtmp_ckipmic.h
rtmp_def.h	staging: Fix typos in rt2860	2010-11-09 16:43:01 -08:00
rtmp_dot11.h
rtmp_iface.h
rtmp_mcu.h
rtmp_os.h
rtmp_timer.h	staging: Fix typos in rt2860	2010-11-09 16:43:01 -08:00
rtmp_type.h
rtusb_io.h
spectrum.h	staging: Fix typos in rt2860	2010-11-09 16:43:01 -08:00
spectrum_def.h
sta_ioctl.c	staging: Fix typos in rt2860	2010-11-09 16:43:01 -08:00
TODO
usb_main_dev.c	staging: rt2870sta: Add ID for Linksys WUSB100v2	2011-01-20 12:01:23 -08:00
wpa.h	Staging: rt2860: wpa.h: Fix space after unary '*' operator.	2011-01-25 18:03:25 +08:00