Greg Kroah-Hartman 32235b07b5 Staging: merge 2.6.39-rc3 into staging-next ...

This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

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

2011-04-13 12:14:05 -07:00

..

core.h

staging: winbond: needs <linux/delay.h> for msleep and friends

2011-02-28 19:14:22 -08:00

Kconfig

…

localpara.h

…

mac_structures.h

Staging: w35und: Kill unused code in mac_structures.h

2010-12-01 14:45:45 -08:00

Makefile

Staging: w35und: Merge mlmetxrx.c to mds.c

2010-12-01 14:45:46 -08:00

mds_f.h

Staging: w35und: Kill empty Mds_Destroy function

2010-11-09 16:07:00 -08:00

mds_s.h

Staging: w35und: Kill write-only ->TxToggle

2010-12-01 14:45:46 -08:00

mds.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

mto.c

staging: winbond/mto.c: remove unused variables

2011-04-04 22:55:49 -07:00

mto.h

…

phy_calibration.c

staging: winbond: fixing some code styles issues

2011-04-04 22:55:48 -07:00

phy_calibration.h

Staging: w35und: Rename wbhal_s.h to wbhal.h

2010-11-09 15:55:55 -08:00

reg.c

Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_

2010-12-01 14:45:46 -08:00

sme_api.h

…

TODO

staging: w35und: Add locking problems to TODO list

2010-09-21 10:46:04 -07:00

wb35reg_f.h

Staging: w35und: Rename wbhal_s.h to wbhal.h

2010-11-09 15:55:55 -08:00

wb35reg_s.h

Staging: w35und: Remove unused fields from struct wb_usb

2010-12-01 14:45:47 -08:00

wb35reg.c

staging: winbond: Remove NULL check before kfree

2011-03-14 11:57:38 -07:00

wb35rx_f.h

Staging: w35und: Rename wbhal_s.h to wbhal.h

2010-11-09 15:55:55 -08:00

wb35rx_s.h

…

wb35rx.c

Staging: w35und: Kill struct wb_usb

2010-12-01 14:45:47 -08:00

wb35tx_f.h

Staging: w35und: Merge wbhal_f.h to wbhal_s.h

2010-11-09 15:55:55 -08:00

wb35tx_s.h

…

wb35tx.c

Staging: w35und: Kill struct wb_usb

2010-12-01 14:45:47 -08:00

wbhal.h

Staging: w35und: Kill struct wb_usb

2010-12-01 14:45:47 -08:00

wbusb.c

mac80211: make tx() operation return void

2011-02-25 15:32:34 -05:00