davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7b6d91daee
kernel-ark/drivers/staging/vt6656
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: vt6656: cleared checkpatch.pl findings in 80211hdr.h 2010-05-11 11:35:55 -07:00
80211mgr.c Staging: vt6656: removed VOID/PVOID definitions 2010-05-11 11:36:01 -07:00
80211mgr.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
aes_ccmp.c staging: vt6656: aes_ccmp.c: code cleanup, cleared checkpatch findings 2010-05-11 15:53:37 -07:00
aes_ccmp.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
baseband.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
baseband.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
bssdb.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
bssdb.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
card.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
card.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
channel.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
channel.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
control.c Staging: vt6656: control.c: Fixed coding style issues 2010-05-11 11:35:53 -07:00
control.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
country.h
datarate.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
datarate.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
desc.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
device_cfg.h
device.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
dpc.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
dpc.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
firmware.c Staging: vt6656: Removed IN definition 2010-05-11 11:35:56 -07:00
firmware.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
hostap.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
hostap.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
int.c staging: vt6656: code cleanup, removed HANDLE definition in ttype.h 2010-05-11 14:18:23 -07:00
int.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
iocmd.h staging: vt6656: code cleanup, replaced U32 macro with u32 2010-05-14 13:23:06 -07:00
ioctl.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
ioctl.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
iowpa.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
iwctl.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
iwctl.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
Kconfig Staging/vt66*: kconfig, depends on WLAN 2009-12-23 11:27:50 -08:00
key.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
key.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
mac.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
mac.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
main_usb.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
Makefile
mib.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
mib.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
michael.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
michael.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
power.c staging: vt6656: code cleanup, removed HANDLE definition in ttype.h 2010-05-11 14:18:23 -07:00
power.h staging: vt6656: code cleanup, removed HANDLE definition in ttype.h 2010-05-11 14:18:23 -07:00
rc4.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rc4.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rf.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rf.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
rndis.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
rxtx.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
rxtx.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
srom.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
tcrc.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
tcrc.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
tether.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
tether.h Staging: vt6656: use ETH_HLEN macro instead of custom one 2010-05-18 14:55:05 -07:00
tkip.c Staging: vt6656: removed VOID/PVOID definitions 2010-05-11 11:36:01 -07:00
tkip.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
tmacro.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
TODO Staging: update TODO files 2009-11-30 16:39:42 -08:00
ttype.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
upc.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
usbpipe.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
usbpipe.h Staging: vt6656: code cleanup, removed OUT definition 2010-05-11 11:36:12 -07:00
vntconfiguration.dat
wcmd.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wcmd.h staging: vt6656: code cleanup, removed HANDLE definition in ttype.h 2010-05-11 14:18:23 -07:00
wctl.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wctl.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wmgr.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wmgr.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wpa2.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wpa2.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00
wpa.c Staging: vt6656: removed VOID/PVOID definitions 2010-05-11 11:36:01 -07:00
wpa.h Staging: vt6656: code cleanup, fixed comments style at the end of headers 2010-05-11 11:36:01 -07:00
wpactl.c Staging: Use kcalloc or kzalloc 2010-05-14 14:02:56 -07:00
wpactl.h Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 2010-05-18 14:51:08 -07:00