kevin/linux
1
Fork 0
Code
ef3eb71d8b
linux/drivers/staging/vt6655
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
..
80211hdr.h Staging: vt6655: 80211hdr.h: Checkpatch cleanup 2010-05-11 11:35:29 -07:00
80211mgr.c Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
80211mgr.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
aes_ccmp.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
aes_ccmp.h
baseband.c Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
baseband.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
bssdb.c Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
bssdb.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
card.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
card.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
country.h
datarate.c Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
datarate.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
desc.h Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
device_cfg.h
device_main.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
device.h Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
dpc.c Staging: vt6655: use ETH_FCS_LEN macro instead of custom one 2010-05-18 14:55:05 -07:00
dpc.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
hostap.c Staging: Use kcalloc or kzalloc 2010-05-14 14:02:56 -07:00
hostap.h Staging: vt6655: Rename hostap_set_hostapd, hostap_iotctl. 2010-05-11 11:35:56 -07:00
IEEE11h.c Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
IEEE11h.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
iocmd.h
ioctl.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
ioctl.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
iowpa.h
iwctl.c Staging: vt6655: remove HANDLE definition and use 2010-05-14 13:20:35 -07:00
iwctl.h
Kconfig
key.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
key.h Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
mac.c Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
mac.h Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
Makefile
mib.c Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one 2010-05-18 15:00:02 -07:00
mib.h Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
michael.c Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
michael.h Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
power.c Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
power.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
rc4.c Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
rc4.h Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
rf.c Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
rf.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
rxtx.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
rxtx.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
srom.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
srom.h Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
tcrc.c
tcrc.h
test
tether.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
tether.h Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one 2010-05-18 15:00:02 -07:00
tkip.c Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
tkip.h Staging: vt6655: remove VOID definition and use 2010-05-11 14:56:28 -07:00
tmacro.h
TODO
ttype.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
upc.h
vntconfiguration.dat
vntwifi.c Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
vntwifi.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
wcmd.c Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
wcmd.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
wctl.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
wctl.h
wmgr.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
wmgr.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
wpa2.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
wpa2.h Staging: vt6655: remove OUT definition 2010-05-14 13:24:41 -07:00
wpa.c Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
wpa.h Staging: vt6655: remove IN definition 2010-05-14 13:24:03 -07:00
wpactl.c Staging: vt6655: use ETH_ALEN macro instead of custom one 2010-05-17 16:26:42 -07:00
wpactl.h
wroute.c Staging: vt6655: use ETH_DATA_LEN macro instead of custom one 2010-05-18 14:58:32 -07:00
wroute.h