Greg Kroah-Hartman e9563355ac Staging: Merge staging-next into Linus's tree ...

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/batman-adv/bat_sysfs.c
	drivers/staging/batman-adv/device.c
	drivers/staging/batman-adv/hard-interface.c
	drivers/staging/cx25821/cx25821-audups11.c

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

2010-08-05 14:18:03 -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: rtmp_timer: remove casts from void*

2010-07-08 13:49:36 -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

ap.h

Staging: RT2860: Fixed everything in ap.h.

2010-07-08 13:24:27 -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: rt28x0: remove typedefs (part three)

2009-12-11 12:23:16 -08: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

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: 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: rt2860: rt_linux: remove casts from void*

2010-07-08 13:49:36 -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_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 Fixed all errors in mlme.h and all but one in rtmp.h.

2010-06-22 14:43:05 -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: rc2860: return -EFAULT on copy_to_user errors

2010-06-04 13:38:58 -07:00

TODO

Staging: rt2860: remove remainders of /etc reading stuff

2009-12-11 12:23:16 -08:00

usb_main_dev.c

Staging: Merge staging-next into Linus's tree

2010-08-05 14:18:03 -07:00

wpa.h

Staging: rt28x0: remove typedefs (part three)

2009-12-11 12:23:16 -08:00