kevin/linux
1
Fork 0
Code
d5ab780305
linux/drivers/staging/vt6655
History
Greg Kroah-Hartman f341dddf1d Staging: merge staging patches into Linus's main branch 
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch.  This merge resolves those merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-03-04 08:39:02 -08:00
..
80211hdr.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
80211mgr.c Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
80211mgr.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
aes_ccmp.c Staging: vt665x: Remove umem.h Part 1 2009-09-15 12:02:08 -07:00
aes_ccmp.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
baseband.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
baseband.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
bssdb.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
bssdb.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
card.c staging: vt6655: add missing curly braces 2010-03-03 16:42:58 -08:00
card.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
country.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
datarate.c Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
datarate.h
desc.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
device_cfg.h Staging: vt665x: Typedef and macro cleanup Part 2 2009-09-15 12:02:07 -07:00
device_main.c Staging: merge staging patches into Linus's main branch 2010-03-04 08:39:02 -08:00
device.h Staging: vt6655 remove unneeded version.h 2009-12-11 12:23:17 -08:00
dpc.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
dpc.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
hostap.c Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
hostap.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
IEEE11h.c Staging: vt665x: Remove umem.h Part 1 2009-09-15 12:02:08 -07:00
IEEE11h.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
iocmd.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
ioctl.c Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
ioctl.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
iowpa.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
iwctl.c Staging: v56655: add missing parentheses (in comment) 2010-03-03 16:42:40 -08:00
iwctl.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
Kconfig Staging/vt66*: kconfig, depends on WLAN 2009-12-23 11:27:50 -08:00
key.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
key.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
mac.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
mac.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
Makefile Staging: vt665x: fix built-in compiling 2009-09-15 12:02:34 -07:00
mib.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
mib.h Staging: fix assorted typos all over the place 2009-12-11 12:23:20 -08:00
michael.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
michael.h Staging: vt665x: Remove umem.h Part 1 2009-09-15 12:02:08 -07:00
power.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
power.h Staging: vt665x: Text janitor in prep for driver merge, part 2 2009-09-15 12:02:07 -07:00
rc4.c Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
rc4.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
rf.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
rf.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
rxtx.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
rxtx.h Staging: vt6655: remove __cplusplus ifdefs 2009-12-11 12:23:17 -08:00
srom.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
srom.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
tcrc.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
tcrc.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
test
tether.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
tether.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
tkip.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
tkip.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
tmacro.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
TODO Staging: update TODO files 2009-11-30 16:39:42 -08:00
ttype.h Staging: vt665x: Typedef and macro cleanup Part 2 2009-09-15 12:02:07 -07:00
upc.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
vntconfiguration.dat
vntwifi.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
vntwifi.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wcmd.c Staging: vt6655 remove duplicate includes 2009-12-11 12:23:17 -08:00
wcmd.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wctl.c Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wctl.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wmgr.c Staging: vt665x: remove tbit.h part 2 2009-09-15 12:02:08 -07:00
wmgr.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wpa2.c Staging: vt665x: Remove umem.h Part 1 2009-09-15 12:02:08 -07:00
wpa2.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wpa.c Staging: vt665*: fix printk formats 2009-12-11 12:23:18 -08:00
wpa.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wpactl.c Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wpactl.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00
wroute.c Staging: vt6655: Correct unsigned bound issue 2009-12-11 12:23:16 -08:00
wroute.h Staging: vt665x: Clean up include files, Part 2 2009-09-15 12:02:08 -07:00