kevin/linux
1
Fork 0
Code
bee31369ce
linux/drivers/staging/winbond
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
..
core.h Staging: winbond: fix comments coding style issue in core.h 2010-05-11 11:35:48 -07:00
Kconfig
localpara.h staging: winbond: localpara.h whitespace and indentation fixes. 2010-05-11 15:01:44 -07:00
mac_structures.h Staging: winbond: fix brace and space coding style issue in mac_structures.h 2010-05-11 11:35:48 -07:00
Makefile
mds_f.h
mds_s.h
mds.c Staging: winbond: Fix for pointer name format issue in mds.c 2010-05-18 14:51:08 -07:00
mlme_s.h Staging: winbond: mlme_s.h Coding style fixes 2010-05-11 11:35:47 -07:00
mlmetxrx_f.h Staging: winbond: fix comments and space coding style issue in mlmetxrx_f.h 2010-05-11 11:35:49 -07:00
mlmetxrx.c Staging: winbond: fix brace, comments and space coding style issue in mlmetxrx.c 2010-05-11 11:35:49 -07:00
mto.c Staging: winbond: mto.c Coding style fixes 2010-05-11 11:35:48 -07:00
mto.h Staging: winbond: mto.h Coding style fixes 2010-05-11 11:35:48 -07:00
phy_calibration.c Staging: winbond: Remove typedef for standard types 2010-05-11 11:35:48 -07:00
phy_calibration.h
reg.c Staging: winbond: reg.c Coding style fixes 2010-05-11 11:35:48 -07:00
scan_s.h Staging: winbond: scan_s.h Coding style fixes. 2010-05-11 11:35:48 -07:00
sme_api.h Staging: winbond: sme_api.h Coding style fixes. 2010-05-11 11:35:48 -07:00
sysdef.h Staging: winbond: sysdef.h Coding style fixes. 2010-05-11 11:35:49 -07:00
TODO Staging: winbond: Renamed README to TODO and corrected Pavel's mail 2010-05-11 11:36:01 -07:00
wb35reg_f.h Staging: winbond: wb35reg_f.h Coding style fixes. 2010-05-11 11:35:49 -07:00
wb35reg_s.h Staging: winbond: wb35reg_s.h Coding styls fixes. 2010-05-11 11:35:49 -07:00
wb35reg.c Staging: winbond: wb35reg.c Coding style fixes 2010-05-11 11:35:49 -07:00
wb35rx_f.h
wb35rx_s.h
wb35rx.c Staging: winbond: wb35rx.c Coding style fixes v2. 2010-05-11 11:35:49 -07:00
wb35tx_f.h Staging: winbond: wb35tx_f.h Coding style fixes. 2010-05-11 11:35:49 -07:00
wb35tx_s.h
wb35tx.c
wbhal_f.h Staging: winbond: wbhal_f.h Coding style fixes. 2010-05-11 11:35:49 -07:00
wbhal_s.h Staging: winbond: wbhal_s.h Coding style fixes. 2010-05-11 11:35:50 -07:00
wblinux_f.h Staging: winbond: wblinux_f.h Coding style fixes v2. 2010-05-11 11:35:50 -07:00
wbusb_s.h Staging: winbond: wbusb_s.h Coding style fixes. 2010-05-11 11:35:50 -07:00
wbusb.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00